summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-03-04 11:10:14 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-03-05 15:04:03 +0100
commit194ac2d5496d7895980252059d9e133b218cf170 (patch)
tree5268c38b7ab68dfbeb5cda46f2eb0c4f5ccd65aa /package
parent313c3d0f39e19e08499a529c73875841d7ddff98 (diff)
downloadbuildroot-novena-194ac2d5496d7895980252059d9e133b218cf170.tar.gz
buildroot-novena-194ac2d5496d7895980252059d9e133b218cf170.zip
squashfs: re-add legacy lzma support
Readd legacy LZMA support since older patched kernels might be using it. Introduce an XZ target filesystem option for the new format. [Peter: add a seperate xz target for squashfs-target as well] Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
-rw-r--r--package/squashfs/Config.in6
-rw-r--r--package/squashfs/squashfs.mk12
2 files changed, 16 insertions, 2 deletions
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 673070862..7d0fc71c0 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -28,6 +28,12 @@ config BR2_PACKAGE_SQUASHFS_LZO
help
Support LZO compression algorithm
+config BR2_PACKAGE_SQUASHFS_XZ
+ bool "xz support"
+ select BR2_PACKAGE_XZ
+ help
+ Support XZ compression algorithm
+
endif
comment "squashfs requires a toolchain with LARGEFILE support"
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 5000a8cb4..7aa8ca908 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -2,11 +2,18 @@ SQUASHFS_VERSION=4.2
SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
-# no libattr/xz in BR
+# no libattr in BR
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
SQUASHFS_DEPENDENCIES += xz
+SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=1 COMP_DEFAULT=lzma
+else
+SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=0
+endif
+
+ifeq ($(BR2_PACKAGE_SQUASHFS_XZ),y)
+SQUASHFS_DEPENDENCIES += xz
SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz
else
SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0
@@ -34,7 +41,8 @@ HOST_SQUASHFS_MAKE_ARGS = \
XATTR_SUPPORT=0 \
XZ_SUPPORT=1 \
GZIP_SUPPORT=1 \
- LZO_SUPPORT=1
+ LZO_SUPPORT=1 \
+ LZMA_XZ_SUPPORT=1
define SQUASHFS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) \