[Buildroot] [PATCH] squashfs: do not force gzip support if lz4/xz/zstd is selected

Peter Seiderer ps.report at gmx.net
Fri Dec 7 19:24:32 UTC 2018


Hello Peter,

On Fri,  7 Dec 2018 14:13:55 +0100, Peter Korsgaard <peter at korsgaard.com> wrote:

> The logic to ensure at least one compression backend is selected was not
> updated when lz4, xz and zstd were introduced -  Fix that.
> 
> Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
> ---
>  package/squashfs/Config.in | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
> index c16ebbf27f..fdd8833060 100644
> --- a/package/squashfs/Config.in
> +++ b/package/squashfs/Config.in
> @@ -2,7 +2,12 @@ config BR2_PACKAGE_SQUASHFS
>  	bool "squashfs"
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	depends on BR2_USE_MMU # fork()

Nitpick: maybe a short comment here is helpful (I missed the line while
adding zstd support)?

  # ensure at least on compression backend (defaults to gzip)

> -	select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
> +	select BR2_PACKAGE_SQUASHFS_GZIP if !( \
> +	       BR2_PACKAGE_SQUASHFS_LZ4 || \
> +	       BR2_PACKAGE_SQUASHFS_LZMA || \
> +	       BR2_PACKAGE_SQUASHFS_LZO || \
> +	       BR2_PACKAGE_SQUASHFS_XZ || \
> +	       BR2_PACKAGE_SQUASHFS_ZSTD)
>  	help
>  	  Tools to generate SquashFS filesystems.
>  

Reviewed-by: Peter Seiderer <ps.report at gmx.net>

Regards,
Peter


More information about the buildroot mailing list