aboutsummaryrefslogtreecommitdiffstats
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
commit807acf7ca71fc06496535d0eb7ccfe18717a73ee (patch)
treeda7b39cde7f9b3ee712afbffe85dea13d398ba15
parent871faaed11f31924cf3cf85a7b068bc3192f91d8 (diff)
downloadupstream-807acf7ca71fc06496535d0eb7ccfe18717a73ee.tar.gz
upstream-807acf7ca71fc06496535d0eb7ccfe18717a73ee.tar.bz2
upstream-807acf7ca71fc06496535d0eb7ccfe18717a73ee.zip
swap logic on squashfs version selection
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18163 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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