imagebuilder: suppress rootfs image when filesystem specified

When using imagebuilder to create images, ROOTFS_FILESYSTEM may be
defined to create just the desired images, but the '*-rootfs.tar.gz'
and '*-rootfs.cpio.gz' images are being created unconditionally
for many targets.

By making generation of these images conditional on the state of
ROOTFS_FILESYSTEM, we can save significant space (measured 3-7 MB
depending on length of package list) and time.

Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>

diff --git a/include/image.mk b/include/image.mk
index e0d4cd60a2d8db3317e13d66ed52eced801dccba..7cf729d53c664d8841f7f87279129eb4078a6a4a 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -373,6 +373,7 @@ define Image/gzip-ext4-padded-squashfs
 
 endef
 
+ifeq ($(filter-out targz,$(ROOTFS_FILESYSTEM)),)
 ifdef CONFIG_TARGET_ROOTFS_TARGZ
   define Image/Build/targz
        $(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \
@@ -380,12 +381,15 @@ ifdef CONFIG_TARGET_ROOTFS_TARGZ
                -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
   endef
 endif
+endif
 
+ifeq ($(filter-out cpiogz,$(ROOTFS_FILESYSTEM)),)
 ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
   define Image/Build/cpiogz
        ( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
   endef
 endif
+endif
 
 mkfs_packages = $(filter-out @%,$(PACKAGES_$(call param_get,pkg,pkg=$(target_params))))
 mkfs_packages_add = $(foreach pkg,$(filter-out -% ~%,$(mkfs_packages)),$(pkg)$(call GetABISuffix,$(pkg)))