From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 26 Oct 2009 12:06:47 +0000 (+0000)
Subject: swap logic on squashfs version selection
X-Git-Tag: reboot~22070
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ed19cab256a4b7ef78456a7fe63f8b608762640a;p=oweals%2Fopenwrt.git

swap logic on squashfs version selection

SVN-Revision: 18163
---

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