From: Petr Štetiar <ynezz@true.cz>
Date: Thu, 28 Mar 2019 22:07:28 +0000 (+0000)
Subject: build: image: add variable for gzip-ext4-padded-squashfs
X-Git-Tag: v21.02.0-rc1~5710
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=83d9fb0a99e1a177a442a7ed8cd996309dda2083;p=openwrt%2Fopenwrt.git

build: image: add variable for gzip-ext4-padded-squashfs

This common code could be shared by at least 3 targets (malta, armvirt
and x86) so let's factor it out to separate variable.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/include/image.mk b/include/image.mk
index 3680be2155..f5da4853df 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -298,6 +298,23 @@ define Image/Manifest
 		$(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest
 endef
 
+define Image/gzip-ext4-padded-squashfs
+
+  define Image/Build/squashfs
+    $(call Image/pad-root-squashfs)
+  endef
+
+  ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
+    define Image/Build/gzip/ext4
+      $(call Image/Build/gzip,ext4)
+    endef
+    define Image/Build/gzip/squashfs
+      $(call Image/Build/gzip,squashfs)
+    endef
+  endif
+
+endef
+
 ifdef CONFIG_TARGET_ROOTFS_TARGZ
   define Image/Build/targz
 	$(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \