summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-16 17:53:57 +0000
committeracinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-16 17:53:57 +0000
commit8176b71781fbe40680d5815a6d9a55237a157526 (patch)
tree14335782c691529cb206e5ea8bcfe8fb50ac3da9
parent0853b66205c15fd7a5698a31b46b845bae1380fd (diff)
[x86] Make gzipping of images configurable via menuconfig
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30587 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/x86/image/Config.in4
-rw-r--r--target/linux/x86/image/Makefile24
2 files changed, 23 insertions, 5 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index b60baeabb..ea3a13460 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 185da1096..e52c74919 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))