[ppc40x] merge 2.6.30 patches

[openwrt.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 2fe94a9..847e01c 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -23,13 +23,13 @@ JFFS2OPTS     :=  --pad --big-endian --squash
 SQUASHFS_OPTS :=  -be
 endif
 
 SQUASHFS_OPTS :=  -be
 endif
 

-ifneq ($(CONFIG_LINUX_2_6_29)$(CONFIG_LINUX_2_6_30),)
+ifneq ($(CONFIG_LINUX_2_6_30),)

 USE_SQUASHFS4 := y
 endif
 
 ifneq ($(USE_SQUASHFS4),)
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4
 USE_SQUASHFS4 := y
 endif
 
 ifneq ($(USE_SQUASHFS4),)
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4

-SQUASHFS_OPTS  :=
+SQUASHFS_OPTS  := -lzma

 else
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
 endif
 else
 MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma
 endif