diff options
| author | Vasilis Tsiligiannis <acinonyx@openwrt.gr> | 2012-02-16 17:53:57 +0000 |
|---|---|---|
| committer | Vasilis Tsiligiannis <acinonyx@openwrt.gr> | 2012-02-16 17:53:57 +0000 |
| commit | b4f51343c6df2a97801bf4a543c9694b561868cf (patch) | |
| tree | d9814f7d5c0d5c37bbd74a8141518098a14156ce /target | |
| parent | fa227cef4db71162cf608e6f725ab87e11b9fc9c (diff) | |
| download | upstream-b4f51343c6df2a97801bf4a543c9694b561868cf.tar.gz upstream-b4f51343c6df2a97801bf4a543c9694b561868cf.tar.bz2 upstream-b4f51343c6df2a97801bf4a543c9694b561868cf.zip | |
Make gzipping of images configurable via menuconfig
SVN-Revision: 30587
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/x86/image/Config.in | 4 | ||||
| -rw-r--r-- | target/linux/x86/image/Makefile | 24 |
2 files changed, 23 insertions, 5 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in index b60baeabb9..ea3a13460a 100644 --- 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 185da1096c..e52c74919d 100644 --- 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)) |