Make gzipping of images configurable via menuconfig

SVN-Revision: 30587

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index b60baeabb9fa83330afeac27fd1800c6eba74c20..ea3a13460a5924e7eeeffd97a758e8a1eb62338b 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -80,6 +80,10 @@ config TARGET_IMAGES_PAD
        depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
        default y
 
+config TARGET_IMAGES_GZIP
+       bool "GZip images"
+       default y
+
 config TARGET_KERNEL_PARTSIZE
        int "Kernel partition size (in MB)"
        depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 185da1096c10117b8c35fcd66c54d117bbffa7b8..e52c74919d8c43d55b9f073829104245eaac3a40 100644 (file)
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -167,6 +167,23 @@ ifneq ($(CONFIG_X86_VMDK_IMAGES),)
   endef
 endif
 
+define Image/Build/gzip
+       gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
+       gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
+endef
+
+ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
+  define Image/Build/gzip/ext4
+       $(call Image/Build/gzip,ext4)
+  endef
+  define Image/Build/gzip/jffs2-64k
+       $(call Image/Build/gzip,jffs2-64k)
+  endef
+  define Image/Build/gzip/jffs2-128k
+       $(call Image/Build/gzip,jffs2-128k)
+  endef
+endif
+
 define Image/BuildKernel
        $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
   ifneq ($(CONFIG_X86_ETHERBOOT_IMAGES),)
@@ -194,10 +211,7 @@ define Image/Build
   endif
        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
        $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
-  ifneq (,$findstring($(1),ext4 jffs2))
-       gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
-       gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
-  endif
+       $(call Image/Build/gzip/$(1))
 endef
 
 $(eval $(call BuildImage))