Move pack image to separate file

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

mk/genimage.mk.in

@@ -13,12 +13,7 @@ PHONY += pack install genimage
 PHONY += install$(INSTALL_TARGET_SUFFIX)
 
 pack: create
-	@if [ -d "$(ROOTDIR)/etc/rc.d/init.d" ]; then \
-	    $(VMSG) "Sorting sysvinit services ..."; \
-	    $(TOOLSDIR)/sort-services --rcdir="$(ROOTDIR)/etc/rc.d" "$(ROOTDIR)/etc/rc.d/init.d"; \
-	fi
-	@$(VMSG) "Packing image to archive ..."
-	@$(TOOLSDIR)/pack-image
+	@$(MAKE) $(MFLAGS) -f @projectdir@/mk/main.mk packimage
 
 install$(INSTALL_TARGET_SUFFIX): pack
 	@$(VMSG) "Installing image ..."

mk/main.mk.in

@@ -47,6 +47,10 @@ ifneq ($(call in-goals,genimage),)
 include @projectdir@/mk/genimage.mk
 endif
 
+ifneq ($(call in-goals,packimage),)
+include @projectdir@/mk/packimage.mk
+endif
+
 ifneq ($(call in-goals,process-config),)
 STARTUP_TIME   = $(shell date +'%s')
 WORKDIR_SUFFIX = $(basename $(notdir $(INITRD_CONFIG)))

mk/packimage.mk.in

@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+.PHONY: packimage pack-image post-pack-image pre-pack post-pack
+
+packimage: pre-pack pack-image post-pack-image
+
+pack-image: pre-pack
+	@$(VMSG) "Packing image to archive ..."
+	@$(TOOLSDIR)/pack-image
+
+post-pack-image: pack-image post-pack
+	@:
+
+pre-pack::
+	@if [ -d "$(ROOTDIR)/etc/rc.d/init.d" ]; then \
+	    $(VMSG) "Sorting sysvinit services ..."; \
+	    $(TOOLSDIR)/sort-services --rcdir="$(ROOTDIR)/etc/rc.d" "$(ROOTDIR)/etc/rc.d/init.d"; \
+	fi
+
+# Load requested features
+$(call include-features-once,$(RUNTIME_FEATURE) $(sort $(ALL_ACTIVE_FEATURES)))
+
+pre-pack::
+	@$(VMSG) "Actions before packing are done"
+
+post-pack::
+	@$(VMSG) "Actions after packing are done"