From: florian Date: Tue, 4 Dec 2012 22:59:05 +0000 (+0000) Subject: Revert "include/image.mk: call Image/Build/{cpiogz,targz}" X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=3bcbd529785e95b5d820380262c414c371162d01 Revert "include/image.mk: call Image/Build/{cpiogz,targz}" This breaks on platforms building their own targz/cpioz images. Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34498 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/image.mk b/include/image.mk index 7758c9a90a..503115ddb0 100644 --- a/include/image.mk +++ b/include/image.mk @@ -109,7 +109,6 @@ endif ifneq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),) define Image/mkfs/cpiogz ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) - $(call Image/Build,cpiogz) endef endif @@ -117,7 +116,6 @@ ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),) define Image/mkfs/targz # Preserve permissions (-p) when building as non-root user $(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . - $(call Image/Build,targz) endef endif