summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-28 14:27:03 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-28 14:27:03 +0000
commit85095e9f195aa2a6008424b3d8bb1b2e1e24e4c0 (patch)
treeb8e9b5a1d0d3867a475da253ea8ff50df3810357 /include
parentb1f326e805a514602d9c0fd1bc0f415a69e54171 (diff)
images: allow generating .cpio.gz and/or .tar.gz archives whether ramdisk is selected or not
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21237 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/image.mk23
1 files changed, 12 insertions, 11 deletions
diff --git a/include/image.mk b/include/image.mk
index 34453f460..8dc7e114b 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -95,17 +95,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
endef
endif
- ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
- define Image/mkfs/tgz
- $(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tgz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
- endef
- endif
-
- ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y)
- define Image/mkfs/cpiogz
- ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz )
- endef
- endif
ifeq ($(CONFIG_TARGET_ROOTFS_UBIFS),y)
define Image/mkfs/ubifs
$(CP) ./ubinize.cfg $(KDIR)
@@ -130,6 +119,18 @@ define Image/Checksum
endef
+ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y)
+ define Image/mkfs/cpiogz
+ ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz )
+ endef
+endif
+
+ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
+ define Image/mkfs/tgz
+ $(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tgz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+ endef
+endif
+
ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024)))