[openwrt/openwrt] tools/coreutils: rename list of installed programs

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


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

commit 0928545f3b9f899b97b58bc86e1bd955ce08cde9
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Tue May 30 05:22:54 2023 -0400

    tools/coreutils: rename list of installed programs
    
    Rename the list of programs installed by coreutils
    to PKG_PROGRAMS, which will create a stampfile for each
    through a new feature in host-build.mk.
    
    Also, cleanup a bit to save lines
    regarding the usage of this list.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    (cherry picked from commit 14a85d929b4a0a728dc4390ad34dcf8d69ac3475)
---
 tools/coreutils/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/coreutils/Makefile b/tools/coreutils/Makefile
index 233ab1585d..8630286206 100644
--- a/tools/coreutils/Makefile
+++ b/tools/coreutils/Makefile
@@ -16,20 +16,18 @@ PKG_HASH:=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
 
 HOST_BUILD_PARALLEL := 1
 
-BUILD_PROGRAMS = date readlink touch ln chown ginstall
+PKG_PROGRAMS:=date readlink touch ln chown ginstall
 
 include $(INCLUDE_DIR)/host-build.mk
 
 export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
 
-BUILD_BINS = $(patsubst %,src/%,$(BUILD_PROGRAMS))
-
 HOST_CONFIGURE_ARGS += \
-	 --enable-install-program=$(subst $(space),$(comma),$(strip $(BUILD_PROGRAMS)))
+	 --enable-install-program=$(subst $(space),$(comma),$(strip $(PKG_PROGRAMS)))
 
 HOST_MAKE_FLAGS += \
 	$(AM_TOOL_PATHS_FAKE) \
-	PROGRAMS="$(BUILD_BINS)" \
+	PROGRAMS="$(patsubst %,src/%,$(PKG_PROGRAMS))" \
 	LIBRARIES= MANS= SUBDIRS=.
 
 define Host/Bootstrap
@@ -58,7 +56,7 @@ endef
 
 define Host/Install
 	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(patsubst %,$(HOST_BUILD_DIR)/%,$(BUILD_BINS)) $(1)/bin/
+	$(INSTALL_BIN) $(patsubst %,$(HOST_BUILD_DIR)/src/%,$(PKG_PROGRAMS)) $(1)/bin/
 	ln -sf ginstall $(1)/bin/install
 endef
 




More information about the lede-commits mailing list