summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-03-04 14:10:14 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-03-05 14:04:03 (GMT)
commit194ac2d5496d7895980252059d9e133b218cf170 (patch)
tree5268c38b7ab68dfbeb5cda46f2eb0c4f5ccd65aa
parent313c3d0f39e19e08499a529c73875841d7ddff98 (diff)
downloadbuildroot-194ac2d5496d7895980252059d9e133b218cf170.tar.gz
buildroot-194ac2d5496d7895980252059d9e133b218cf170.tar.bz2
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>
-rw-r--r--fs/squashfs/Config.in3
-rw-r--r--fs/squashfs/squashfs.mk4
-rw-r--r--package/squashfs/Config.in6
-rw-r--r--package/squashfs/squashfs.mk12
4 files changed, 23 insertions, 2 deletions
diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
index 85416be..f13410a 100644
--- a/fs/squashfs/Config.in
+++ b/fs/squashfs/Config.in
@@ -37,5 +37,8 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_LZMA
config BR2_TARGET_ROOTFS_SQUASHFS4_LZO
bool "lzo"
+config BR2_TARGET_ROOTFS_SQUASHFS4_XZ
+ bool "xz"
+
endchoice
endif
diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index 91a7534..a680dae 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -11,11 +11,15 @@ ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
ROOTFS_SQUASHFS_ARGS += -comp lzo
else
ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y)
+ROOTFS_SQUASHFS_ARGS += -comp lzma
+else
+ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y)
ROOTFS_SQUASHFS_ARGS += -comp xz
else
ROOTFS_SQUASHFS_ARGS += -comp gzip
endif
endif
+endif
else
ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 6730708..7d0fc71 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 5000a8c..7aa8ca9 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) \