aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-05-15 12:10:47 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-05-15 12:10:47 +0000
commit80f719bd9179feed1f25f11ce21dc8230120d95c (patch)
treed44fb87160750cc51a31a2028f3472235b821208 /include
parent55317e85f0fcf213bb273b614d09211ea58f748d (diff)
downloadupstream-80f719bd9179feed1f25f11ce21dc8230120d95c.tar.gz
upstream-80f719bd9179feed1f25f11ce21dc8230120d95c.tar.bz2
upstream-80f719bd9179feed1f25f11ce21dc8230120d95c.zip
[image] create squashfs4 images if kernel version >=2.6.29
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15866 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/image.mk13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/image.mk b/include/image.mk
index 3341f10e50..2fe94a94e7 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -23,6 +23,17 @@ JFFS2OPTS := --pad --big-endian --squash
SQUASHFS_OPTS := -be
endif
+ifneq ($(CONFIG_LINUX_2_6_29)$(CONFIG_LINUX_2_6_30),)
+USE_SQUASHFS4 := y
+endif
+
+ifneq ($(USE_SQUASHFS4),)
+MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
+SQUASHFS_OPTS :=
+else
+MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
+endif
+
JFFS2_BLOCKSIZE ?= 64k 128k
define add_jffs2_mark
@@ -55,7 +66,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),y)
define Image/mkfs/squashfs
@mkdir -p $(TARGET_DIR)/jffs
- $(STAGING_DIR_HOST)/bin/mksquashfs-lzma $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS)
+ $(MKSQUASHFS_CMD) $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS)
$(call Image/Build,squashfs)
endef
endif