aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasilis Tsiligiannis <acinonyx@openwrt.gr>2012-02-16 17:54:01 +0000
committerVasilis Tsiligiannis <acinonyx@openwrt.gr>2012-02-16 17:54:01 +0000
commitab09db09fc99c552b18fb9eba56917b8a541ea19 (patch)
tree9f1fa289c30f155a1ef525f8ffbc176869b8c43d
parentb4f51343c6df2a97801bf4a543c9694b561868cf (diff)
downloadupstream-ab09db09fc99c552b18fb9eba56917b8a541ea19.tar.gz
upstream-ab09db09fc99c552b18fb9eba56917b8a541ea19.tar.bz2
upstream-ab09db09fc99c552b18fb9eba56917b8a541ea19.zip
GZip only ext4 and padded images
SVN-Revision: 30588
-rw-r--r--target/linux/x86/image/Config.in1
-rw-r--r--target/linux/x86/image/Makefile10
2 files changed, 7 insertions, 4 deletions
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