From 194ac2d5496d7895980252059d9e133b218cf170 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 4 Mar 2011 11:10:14 -0300 Subject: 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 Signed-off-by: Peter Korsgaard --- fs/squashfs/Config.in | 3 +++ fs/squashfs/squashfs.mk | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'fs/squashfs') 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 -- cgit v1.2.3