Pārlūkot izejas kodu

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

SVN-Revision: 21237
Nicolas Thill 15 gadi atpakaļ
vecāks
revīzija
7992df3721
2 mainītis faili ar 12 papildinājumiem un 13 dzēšanām
  1. 0 2
      Config.in
  2. 12 11
      include/image.mk

+ 0 - 2
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
 

+ 12 - 11
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)))