[openwrt/openwrt] host-build: add support for a stampfile per installed binary

LEDE Commits lede-commits at lists.infradead.org
Tue Jun 13 07:49:52 PDT 2023


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/ea22a1f4da2ee98cd8354acc61840199814dfb6d

commit ea22a1f4da2ee98cd8354acc61840199814dfb6d
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Tue May 30 07:20:19 2023 -0400

    host-build: add support for a stampfile per installed binary
    
    Some individual build items install a group of programs
    instead of a program matching the name of the build item.
    
    Add support for installing stampfiles for each of the
    programs installed by that build item,
    which will allow more control and awareness
    of what is installed by the rest of the build system,
    if, for example, prereq symlink checks are looking
    for the same program which is built already.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    (cherry picked from commit 84f7a45e9e83339d84bcc15f06259b1064cb961a)
---
 include/host-build.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/host-build.mk b/include/host-build.mk
index 7485f91e42..dba6b819da 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -26,6 +26,7 @@ HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
 HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
 HOST_BUILD_PREFIX?=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST))
 HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed
+HOST_STAMP_PROGRAMS:=$(foreach program,$(PKG_PROGRAMS),$(subst $(PKG_NAME),$(program),$(HOST_STAMP_INSTALLED)) )
 
 override MAKEFLAGS=
 
@@ -172,7 +173,7 @@ ifndef DUMP
 		$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
 		mkdir -p $$(shell dirname $$@)
 		touch $(HOST_STAMP_BUILT)
-		touch $$@
+		touch $$@ $(HOST_STAMP_PROGRAMS)
 
   $(call DefaultTargets,$(patsubst %,host-%,$(DEFAULT_SUBDIR_TARGETS)))
   ifndef STAMP_BUILT
@@ -187,7 +188,7 @@ ifndef DUMP
 
   $(_host_target)host-prepare: $(HOST_STAMP_PREPARED)
   $(_host_target)host-configure: $(HOST_STAMP_CONFIGURED)
-  $(_host_target)host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED)
+  $(_host_target)host-compile: $(HOST_STAMP_BUILT) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_PROGRAMS)
   host-install: host-compile
 
   host-clean-build: FORCE
@@ -196,7 +197,7 @@ ifndef DUMP
 
   host-clean: host-clean-build
 	$(call Host/Clean)
-	rm -rf $(HOST_STAMP_INSTALLED)
+	rm -rf $(HOST_STAMP_INSTALLED) $(HOST_STAMP_PROGRAMS)
 
     ifneq ($(CONFIG_AUTOREMOVE),)
       host-compile:




More information about the lede-commits mailing list