From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Thu, 16 Feb 2012 17:54:01 +0000 (+0000)
Subject: GZip only ext4 and padded images
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ab09db09fc99c552b18fb9eba56917b8a541ea19;p=openwrt%2Fstaging%2Flinusw.git

GZip only ext4 and padded images

SVN-Revision: 30588
---

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index ea3a13460a..99054933e6 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -82,6 +82,7 @@ config TARGET_IMAGES_PAD
 
 config TARGET_IMAGES_GZIP
 	bool "GZip images"
+	depends TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
 	default y
 
 config TARGET_KERNEL_PARTSIZE
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index e52c74919d..6db12fca1c 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -176,12 +176,14 @@ ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
   define Image/Build/gzip/ext4
 	$(call Image/Build/gzip,ext4)
   endef
-  define Image/Build/gzip/jffs2-64k
+  ifneq ($(CONFIG_TARGET_IMAGES_PAD),)
+    define Image/Build/gzip/jffs2-64k
 	$(call Image/Build/gzip,jffs2-64k)
-  endef
-  define Image/Build/gzip/jffs2-128k
+    endef
+    define Image/Build/gzip/jffs2-128k
 	$(call Image/Build/gzip,jffs2-128k)
-  endef
+    endef
+  endif
 endif
 
 define Image/BuildKernel