squashfs: readd legacy lzma support

PATCH New Gustavo Zacarias 2 participants 2 messages Mar 4, 2011 – Mar 5, 2011 SquashFS file system

Share & tools

Gustavo Zacarias

author

2011-03-04 14:10 UTC #0 lore raw

PATCH 1/1 squashfs: readd 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.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 fs/squashfs/Config.in        |    3 +++
 fs/squashfs/squashfs.mk      |    4 ++++
 package/squashfs/squashfs.mk |    5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

fs/squashfs/Config.in +3 -0

index 85416be..f13410a 100644
@@ -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

fs/squashfs/squashfs.mk +4 -0

index 91a7534..a680dae 100644
@@ -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

package/squashfs/squashfs.mk +3 -2

index 5000a8c..b23b303 100644
@@ -7,7 +7,7 @@ SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
 
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
 SQUASHFS_DEPENDENCIES += xz
-SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz
+SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=1 XZ_SUPPORT=1 COMP_DEFAULT=xz
 else
 SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0
 endif

@@ -34,7 +34,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)    \

Signature · 1 line

1.7.3.4

Peter Korsgaard

2011-03-05 14:15 UTC #1 lore raw

PATCH 1/1 squashfs: readd legacy lzma support

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Readd legacy LZMA support since older patched kernels might be Gustavo> using it. Introduce an XZ target filesystem option for the Gustavo> new format.

Committed with a small tweak, thanks.

Signature · 1 line

Bye, Peter Korsgaard