NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

squashfs: re-add legacy lzma support

Browse Source 
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>
This commit is contained in:
Gustavo Zacarias 2011-03-04 11:10:14 -03:00 committed by Peter Korsgaard
parent 313c3d0f39
commit 194ac2d549
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/squashfs/Config.in
View File

@ -37,5 +37,8 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_LZMA
config BR2_TARGET_ROOTFS_SQUASHFS4_LZO config BR2_TARGET_ROOTFS_SQUASHFS4_LZO
bool "lzo" bool "lzo"
config BR2_TARGET_ROOTFS_SQUASHFS4_XZ
bool "xz"
endchoice endchoice
endif endif

4
fs/squashfs/squashfs.mk
View File

@ -11,11 +11,15 @@ ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
ROOTFS_SQUASHFS_ARGS += -comp lzo ROOTFS_SQUASHFS_ARGS += -comp lzo
else else
ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y) 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 ROOTFS_SQUASHFS_ARGS += -comp xz
else else
ROOTFS_SQUASHFS_ARGS += -comp gzip ROOTFS_SQUASHFS_ARGS += -comp gzip
endif endif
endif endif
endif
else else
ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3 ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3

6
package/squashfs/Config.in
View File

@ -28,6 +28,12 @@ config BR2_PACKAGE_SQUASHFS_LZO
help help
Support LZO compression algorithm Support LZO compression algorithm
config BR2_PACKAGE_SQUASHFS_XZ
bool "xz support"
select BR2_PACKAGE_XZ
help
Support XZ compression algorithm
endif endif
comment "squashfs requires a toolchain with LARGEFILE support" comment "squashfs requires a toolchain with LARGEFILE support"

12
package/squashfs/squashfs.mk
View File

@ -2,11 +2,18 @@ SQUASHFS_VERSION=4.2
SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs 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 SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y) ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
SQUASHFS_DEPENDENCIES += xz 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 SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz
else else
SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0 SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0
@ -34,7 +41,8 @@ HOST_SQUASHFS_MAKE_ARGS = \
XATTR_SUPPORT=0 \ XATTR_SUPPORT=0 \
XZ_SUPPORT=1 \ XZ_SUPPORT=1 \
GZIP_SUPPORT=1 \ GZIP_SUPPORT=1 \
LZO_SUPPORT=1 LZO_SUPPORT=1 \
LZMA_XZ_SUPPORT=1
define SQUASHFS_BUILD_CMDS define SQUASHFS_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) \ $(TARGET_MAKE_ENV) $(MAKE) \