[openwrt/openwrt] tools: rework tools-core dependecies
LEDE Commits
lede-commits at lists.infradead.org
Sat Apr 6 02:24:32 PDT 2024
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/e09d3fd2904a35beaf5e27e81538cd8061b0ef36
commit e09d3fd2904a35beaf5e27e81538cd8061b0ef36
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Wed Apr 3 12:17:21 2024 -0700
tools: rework tools-core dependecies
ZSTD and libdeflate do not depend on SED nor flock, so instead of the whole
for loop that will filter 2 out of 4 core packages just specify that patch
and tar depend on sed explicitly.
ZSTD now depends on libdeflate since libdeflate-gzip will then be used to
unpack ZSTD as well as most tool archives.
Signed-off-by: Rosen Penev <rosenp at gmail.com>
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
tools/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index 445101c012..f60a458f98 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -164,8 +164,10 @@ tools-core += zstd
$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(patsubst %,$(curdir)/%/compile,$(tools-core))))
tools-y += $(tools-core)
-# make core tools depend on sed and flock
-$(foreach tool, $(filter-out zstd,$(tools-core)), $(eval $(curdir)/$(tool)/compile += $(curdir)/sed/compile))
+# make some core tools depend on sed and flock
+$(curdir)/patch/compile += $(curdir)/sed/compile
+$(curdir)/tar/compile += $(curdir)/sed/compile
+$(curdir)/zstd/compile += $(curdir)/libdeflate/compile
$(curdir)/sed/compile := $(curdir)/flock/compile $(curdir)/zstd/compile
tools-y += flock sed
More information about the lede-commits
mailing list