diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-25 21:27:40 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-02-25 21:27:40 +0100 |
| commit | eaf18b8b788c5651b67fb90c12907217f009cc80 (patch) | |
| tree | 5a28afff939f7ea2005344e4d5705ca38c318c94 | |
| parent | 53725fafee39cad72f586f7306acc25afaecbbc6 (diff) | |
| download | buildroot-novena-eaf18b8b788c5651b67fb90c12907217f009cc80.tar.gz buildroot-novena-eaf18b8b788c5651b67fb90c12907217f009cc80.zip | |
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.in | 1 | ||||
| -rw-r--r-- | package/squashfs/squashfs.mk | 5 |
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 |