summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-02-25 20:27:40 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-02-25 20:27:40 (GMT)
commiteaf18b8b788c5651b67fb90c12907217f009cc80 (patch)
tree5a28afff939f7ea2005344e4d5705ca38c318c94
parent53725fafee39cad72f586f7306acc25afaecbbc6 (diff)
downloadbuildroot-eaf18b8b788c5651b67fb90c12907217f009cc80.tar.gz
buildroot-eaf18b8b788c5651b67fb90c12907217f009cc80.tar.bz2
squashfs: use kconfig to ensure atleast one compressor is selected
Similar to how we do it for mpd now. This way, the selection is clearly visible to the user, instead of the hidden selection we used to do in the makefile. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-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 d28926e..6730708 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 7cbec32..50e8964 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