aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2018-12-07 14:13:55 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-12-16 16:16:33 +0100
commitb844a51ab4fc37c9b496c82a2fbe3c8567d40498 (patch)
treef8f5ad825cc27f970daf599983b2b7db41f977f9
parentef6432d24fb457e2bece2713982907fb7d7a1c6d (diff)
downloadbuildroot-b844a51ab4fc37c9b496c82a2fbe3c8567d40498.tar.gz
buildroot-b844a51ab4fc37c9b496c82a2fbe3c8567d40498.tar.bz2
squashfs: do not force gzip support if lz4/xz/zstd is selected
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> (cherry picked from commit 84aeb4419f394b2eb11a22a962bc20e05b311b5f) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/squashfs/Config.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index c16ebbf27f..f5ae5d9bec 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -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.