Commit 194ac2d5 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

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: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 313c3d0f

fs/squashfs/Config.in

+3 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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/Config.in

+6 −0
Original line number Diff line number Diff line
@@ -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"

package/squashfs/squashfs.mk

+10 −2
Original line number Diff line number Diff line
@@ -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)    \