summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/squashfs/Config.in1
-rw-r--r--package/squashfs/squashfs.mk5
2 files changed, 1 insertions, 5 deletions
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index d28926e0f..673070862 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -1,6 +1,7 @@
config BR2_PACKAGE_SQUASHFS
bool "squashfs"
depends on BR2_LARGEFILE
+ select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
help
Tools to generate SquashFS filesystems.
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 7cbec32f1..50e8964ca 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -5,11 +5,6 @@ SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/sq
# no libattr/xz in BR
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
-# we need atleast one compresser, so use gzip if none are enabled
-ifeq ($(BR2_PACKAGE_SQUASHFS_GZIP)$(BR2_PACKAGE_SQUASHFS_LZO)$(BR2_PACKAGE_SQUASHFS_LZMA),)
-BR2_PACKAGE_SQUASHFS_GZIP=y
-endif
-
ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
SQUASHFS_DEPENDENCIES += xz
SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=lzma