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

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

[Peter Korsgaard]

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@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()
-	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.
 
-- 
2.11.0

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

[Peter Seiderer]

Hello Peter,

On Fri,  7 Dec 2018 14:13:55 +0100, Peter Korsgaard <peter@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@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@gmx.net>

Regards,
Peter

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

[Peter Korsgaard]

>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:

 > Hello Peter,
 > On Fri,  7 Dec 2018 14:13:55 +0100, Peter Korsgaard <peter@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@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)

Committed after adding this comment, thanks.

-- 
Bye, Peter Korsgaard

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

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > 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@korsgaard.com>

Committed to 2018.02.x, 2018.08.x and 2018.11.x, thanks.

-- 
Bye, Peter Korsgaard