summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-03 01:02:00 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-03 01:02:00 +0000
commitb5b89c229819414c8bf741fef9d1a9dbb042a2da (patch)
tree3f02232de53773909d9b65893820367f2c06de25 /include
parent09702f9b6732d6f4ce342eb17c4044fe2f5f462c (diff)
tools/squashfs4: update to version 4.2 (adds support for xz compression)
Based on a patch by Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26422 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/image.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk
index c72ec8180..753e88f87 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -42,6 +42,14 @@ ifneq ($(CONFIG_JFFS2_LZMA),y)
JFFS2OPTS += -x lzma
endif
+LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2
+ifeq ($(CONFIG_SQUASHFS_LZMA),y)
+ SQUASHFSCOMP := lzma $(LZMA_XZ_OPTIONS)
+endif
+ifeq ($(CONFIG_SQUASHFS_XZ),y)
+ SQUASHFSCOMP := xz $(LZMA_XZ_OPTIONS)
+endif
+
JFFS2_BLOCKSIZE ?= 64k 128k
define add_jffs2_mark
@@ -86,7 +94,7 @@ else
ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
define Image/mkfs/squashfs
@mkdir -p $(TARGET_DIR)/overlay
- $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp lzma -processors 1
+ $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) -processors 1
$(call Image/Build,squashfs)
endef
endif