From 706035474c2446d2adb81cf3c406e5c81eb8dc78 Mon Sep 17 00:00:00 2001 From: kaloz Date: Mon, 26 Oct 2009 12:06:47 +0000 Subject: [PATCH] swap logic on squashfs version selection git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18163 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/image.mk b/include/image.mk index cab9722df..237d87c90 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