aboutsummaryrefslogtreecommitdiffstats
path: root/include/image.mk
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-10-26 12:06:47 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-10-26 12:06:47 +0000
commited19cab256a4b7ef78456a7fe63f8b608762640a (patch)
tree8a16c042ee7ad98901daef17f58d349b69bcfb7f /include/image.mk
parent3dd87b893af81fa8ef4200770e0ce97f0d572b45 (diff)
downloadupstream-ed19cab256a4b7ef78456a7fe63f8b608762640a.tar.gz
upstream-ed19cab256a4b7ef78456a7fe63f8b608762640a.tar.bz2
upstream-ed19cab256a4b7ef78456a7fe63f8b608762640a.zip
swap logic on squashfs version selection
SVN-Revision: 18163
Diffstat (limited to 'include/image.mk')
-rw-r--r--include/image.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/image.mk b/include/image.mk
index cab9722df6..237d87c90a 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -23,15 +23,15 @@ JFFS2OPTS := --pad --big-endian --squash
SQUASHFS_OPTS := -be
endif
-ifneq ($(CONFIG_LINUX_2_6_30)$(CONFIG_LINUX_2_6_31),)
-USE_SQUASHFS4 := y
+ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),)
+USE_SQUASHFS3 := y
endif
-ifneq ($(USE_SQUASHFS4),)
+ifneq ($(USE_SQUASHFS3),)
+MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
+else
MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
SQUASHFS_OPTS := -lzma -processors 1
-else
-MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
endif
JFFS2_BLOCKSIZE ?= 64k 128k