squashfs: do not force gzip support if lz4/xz/zstd is selected
authorPeter Korsgaard <peter@korsgaard.com>
Fri, 7 Dec 2018 13:13:55 +0000 (14:13 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Fri, 7 Dec 2018 23:11:36 +0000 (00:11 +0100)
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>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
[Peter: add comment as suggested by Peter Seiderer]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/squashfs/Config.in

index c16ebbf27f04ffda842bb9d61ebd87847c8866a2..f5ae5d9bec85566b3d76985e50c35af1eea187ec 100644 (file)
@@ -2,7 +2,13 @@ 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)
+       # ensure at least on compression backend (defaults to gzip)
+       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.