hacks: reorganize a index with preinst and postinst

Author: a-gave

README.md

@@ -23,13 +23,14 @@ Supported hacks:
 - `_hacks/pkg_configs`: Define a list of configs to be modified in PKG_CONFIGS.
 - `_hacks/pkg_conflicts`: Define a list of packages to be removed in PKG_CONFLICTS.
 
-To use the defined PKG_CONFIGS or PKG_CONFLICTS include the preinst defined in `_hacks/preinst.mk` that will trigger a new build with the defined modifications, like in the example below:
-
+Warn: Usable safely with imagebuilder-docker.
 Warn: To use it with asu, the server must support this hack.    
 Currently the asu server https://sysupgrade.antennine.org supports it:
 - do not returning errors if the main build was killed after the second build completes
 - prepending packages that starts with 'profile-' at the beginning of the packages list (to use it with the firmware-selector)
 - checking the manifest from a file printed in BIN_DIR/manifest instead from STDOUT
+
+To use the defined PKG_CONFIGS or PKG_CONFLICTS include the preinst defined in `_hacks/index.mk` that will trigger a new build with the defined modifications, like in the example below:
 ```
 include $(TOPDIR)/rules.mk
 
@@ -42,9 +43,9 @@ PKG_CONFLICTS:=\
 PROFILE_DEPENDS:=\
 	+profile-libremesh-suggested-packages
 
-include ../../_hacks/preinst.mk
+include ../../_hacks/index.mk
 include ../../profile.mk
 
 # call BuildPackage - OpenWrt buildroot signature
 
-```
+```

_hacks/_pkg_configs.mk _hacks/_preinst_pkg_configs.mk_hacks/_pkg_configs.mk renamed to _hacks/_preinst_pkg_configs.mk

@@ -29,7 +29,7 @@ done
 
 echo "########################################################################## pkg_conflicts: Add PKG_CONFLICTS to be removed in the main Makefile"
 sed -i 's|\($$(USER_PACKAGES)\) \($$(BUILD_PACKAGES)\)|\1 $(PKG_CONFLICTS) \2|' $${TOPDIR}/Makefile
-echo "########################################################################## Prevent unnecessary opkg/apk update in the main Makefile"
+echo "########################################################################## pkg_conflicts: Prevent unnecessary opkg/apk update in the main Makefile"
 sed -i '/update/d' $${TOPDIR}/Makefile
 if [ "$${make_target}" = "manifest" ]; then
 	echo "########################################################################## pkg_conflicts: make manifest: use the BIN_DIR of asu if available"

_hacks/_pkg_conflicts.mk _hacks/_preinst_pkg_conflicts.mk_hacks/_pkg_conflicts.mk renamed to _hacks/_preinst_pkg_conflicts.mk

@@ -0,0 +1,8 @@
+include $(TOPDIR)/rules.mk
+
+PROFILE_NAME=$(notdir ${CURDIR})
+PROFILE_COMMUNITY=$(lastword $(filter-out $(PROFILE_NAME),$(subst /, ,$(CURDIR))))
+PKG_NAME:=profile-$(PROFILE_COMMUNITY)-$(PROFILE_NAME)
+
+include ../../_hacks/preinst.mk
+include ../../_hacks/postinst.mk

_hacks/index.mk

@@ -0,0 +1,9 @@
+define Package/$(PKG_NAME)/postinst
+#!/bin/bash
+# Run only in imagebuilder/sdk, exit if executed on the target device or buildroot
+[ -z "$${IPKG_INSTROOT}" ] && exit 0
+[ -f "$${TOPDIR}/version" ] && exit 0
+grep -q IB_MODIFIED_BY_$(PKG_NAME)_preinst $${TOPDIR}/Makefile || exit 0
+echo "########################################################################## Inside package $(PKG_NAME) postinst"
+
+endef

_hacks/postinst.mk

@@ -1,55 +1,64 @@
-include $(TOPDIR)/rules.mk
-
-PROFILE_NAME=$(notdir ${CURDIR})
-PROFILE_COMMUNITY=$(lastword $(filter-out $(PROFILE_NAME),$(subst /, ,$(CURDIR))))
-PKG_NAME:=profile-$(PROFILE_COMMUNITY)-$(PROFILE_NAME)
-
 define Package/$(PKG_NAME)/preinst
 #!/bin/bash
+# Run only in imagebuilder/sdk, exit if executed on the target device or buildroot
 [ -z "$${IPKG_INSTROOT}" ] && exit 0
 [ -f "$${TOPDIR}/version" ] && exit 0
-grep -q IB_MODIFIED_BY_$(PKG_NAME) $${TOPDIR}/Makefile && exit 0
+grep -q IB_MODIFIED_BY_$(PKG_NAME)_preinst $${TOPDIR}/Makefile && exit 0
 echo "########################################################################## Inside package $(PKG_NAME) preinst"
 echo "########################################################################## Backup original files"
 cp $${TOPDIR}/Makefile $${TOPDIR}/Makefile.orig
 cp $${TOPDIR}/.config $${TOPDIR}/.config.orig
+cp $${TOPDIR}/include/rootfs.mk $${TOPDIR}/include/rootfs.mk.orig
+
+echo "########################################################################## Ensure postinst-pkg are executed"
+sed -i 's|\(IPKG_POSTINST_PATH=\).*|\1./usr/lib/opkg/info/\*\.postinst\*; \\|' $${TOPDIR}/include/rootfs.mk
+
 echo "########################################################################## Determine make's target"
 cmdline_args=$$(cat /proc/*/cmdline | tr -d '\0' | head -n 1)
 make_target=$$(echo "$${cmdline_args}" | grep -q makemanifest && echo 'manifest' || echo 'image')
 echo "make_target: $${make_target}"
 
+echo "########################################################################## Check if a re-run is needed"
+need_rerun=0
+
 if [ -n "$(PKG_CONFIGS)" ]; then
 $(Package/$(PKG_NAME)/preinst_pkg_configs)
+echo "########################################################################## pkg_configs: end"
 fi
+
 if [ -n "$(PKG_CONFLICTS)" ]; then
 $(Package/$(PKG_NAME)/preinst_pkg_conflicts)
+echo "########################################################################## pkg_conflicts: end"
 fi
 
+
 echo "########################################################################## Add a target that restore original files and kill parent process"
 cat << EOF >> $${TOPDIR}/Makefile
 fail_target:
 	mv $${TOPDIR}/Makefile.orig $${TOPDIR}/Makefile
 	mv $${TOPDIR}/.config.orig $${TOPDIR}/.config
+	mv $${TOPDIR}/include/rootfs.mk.orig $${TOPDIR}/include/rootfs.mk
 	kill $$(ls -l /proc/*/exe | grep make | sed 's|.*/proc/\(.*\)/exe.*|\1|' | tr '\n' ' ' )
-# IB_MODIFIED_BY_$(PKG_NAME)
+# IB_MODIFIED_BY_$(PKG_NAME)_preinst
 EOF
 
 if [ $${need_rerun} = 1 ]; then
-	echo "########################################################################## Re-run make ${make_target} with the untouched MAKEFLAGS"
-	make $${make_target}
+	echo "########################################################################## Re-run make $${make_target} with the untouched MAKEFLAGS"
+	make $${make_target} 
 	make fail_target
 else
 	echo "########################################################################## Restore original files and continue build without hack"
-	mv $${TOPDIR}/Makefile.orig $${TOPDIR}/Makefile
-	mv $${TOPDIR}/.config.orig $${TOPDIR}/.config
-	exit 0
+	mv $${TOPDIR}/Makefile.orig $${TOPDIR}/Makefile 2>/dev/null
+	mv $${TOPDIR}/.config.orig $${TOPDIR}/.config 2>/dev/null
+	mv $${TOPDIR}/include/rootfs.mk.orig $${TOPDIR}/include/rootfs.mk 2>/dev/null
 fi
+
 endef
 
 ifneq ($(PKG_CONFIGS),)
-include ../../_hacks/_pkg_configs.mk
+include ../../_hacks/_preinst_pkg_configs.mk
 endif
 
 ifneq ($(PKG_CONFLICTS),)
-include ../../_hacks/_pkg_conflicts.mk
+include ../../_hacks/_preinst_pkg_conflicts.mk
 endif