diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-15 12:10:47 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-15 12:10:47 +0000 |
| commit | ef7cf93ac58270a213f32097290ed0aa118f9eeb (patch) | |
| tree | d44fb87160750cc51a31a2028f3472235b821208 | |
| parent | e5b98fff8d75fbe463ad76eb9375637f91225303 (diff) | |
[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
| -rw-r--r-- | include/image.mk | 13 |
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 |