diff options
| author | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-16 17:54:01 +0000 |
|---|---|---|
| committer | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-16 17:54:01 +0000 |
| commit | 05c64b9247e3d4ba201e70fd21a511b6dbdb472e (patch) | |
| tree | 0476e8f04c67311cc5b199898fe208e8fef1ae42 /target/linux | |
| parent | 8176b71781fbe40680d5815a6d9a55237a157526 (diff) | |
[x86] GZip only ext4 and padded images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30588 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/x86/image/Config.in | 1 | ||||
| -rw-r--r-- | target/linux/x86/image/Makefile | 10 |
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 |