diff options
author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2011-03-04 11:10:14 -0300 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-03-05 15:04:03 +0100 |
commit | 194ac2d5496d7895980252059d9e133b218cf170 (patch) | |
tree | 5268c38b7ab68dfbeb5cda46f2eb0c4f5ccd65aa /fs/squashfs | |
parent | 313c3d0f39e19e08499a529c73875841d7ddff98 (diff) | |
download | buildroot-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 'fs/squashfs')
-rw-r--r-- | fs/squashfs/Config.in | 3 | ||||
-rw-r--r-- | fs/squashfs/squashfs.mk | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index 85416becb..f13410a1c 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 91a7534de..a680dae0f 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 |