From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 28 Apr 2010 14:27:03 +0000 (+0000)
Subject: images: allow generating .cpio.gz and/or .tar.gz archives whether ramdisk is selected... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7992df37218c014ba57d454f1704a27438fbf3b9;p=openwrt%2Fstaging%2Fjow.git

images: allow generating .cpio.gz and/or .tar.gz archives whether ramdisk is selected or not

SVN-Revision: 21237
---

diff --git a/Config.in b/Config.in
index ffe1147f44..4746ba4185 100644
--- a/Config.in
+++ b/Config.in
@@ -63,14 +63,12 @@ menu "Target Images"
 	config TARGET_ROOTFS_TGZ
 		bool "tgz"
 		default y if USES_TGZ
-		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a compressed tar archive of the the root filesystem
 
 	config TARGET_ROOTFS_CPIOGZ
 		bool "cpiogz"
 		default y if USES_CPIOGZ
-		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Build a compressed cpio archive of the the root filesystem
 
diff --git a/include/image.mk b/include/image.mk
index 34453f460a..8dc7e114b6 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)))