[x86] GZip only ext4 and padded images

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30588 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index ea3a134..9905493 100644 (file)
--- 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"
 
 config TARGET_IMAGES_GZIP
        bool "GZip images"

+       depends TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS

        default y
 
 config TARGET_KERNEL_PARTSIZE
        default y
 
 config TARGET_KERNEL_PARTSIZE

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index e52c749..6db12fc 100644 (file)
--- 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/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)
        $(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)
        $(call Image/Build/gzip,jffs2-128k)

-  endef
+    endef
+  endif

 endif
 
 define Image/BuildKernel
 endif
 
 define Image/BuildKernel