[openwrt/openwrt] build: provide xxd -i with scripts/xxdi.pl
LEDE Commits
lede-commits at lists.infradead.org
Wed Sep 21 02:53:18 PDT 2022
ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/1c8c84620de64b20921873c998e93f72dbaccd2a
commit 1c8c84620de64b20921873c998e93f72dbaccd2a
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Tue Aug 30 08:45:39 2022 +0200
build: provide xxd -i with scripts/xxdi.pl
Dependency on xxd was added in commit c4dd2441e787 ("tools: add xxd
(from vim)") as U-Boot requires xxd to create the default environment
from an external file.
Later in commit 2b94aac7a128 ("tools: xxd: use more convenient source
tarball"), xxd from another source was used instead, but that source is
currently unavailable, so let's fix it by using simple xxdi.pl Perl
script instead.
Fixes: #10555
Signed-off-by: Petr Štetiar <ynezz at true.cz>
(cherry picked from commit eae2fb8027cb892e42181e471ba344aa5d26bf7e)
---
include/prereq-build.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index d3593b0205..61cd8ae516 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -192,7 +192,10 @@ $(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c
mkdir -p $(dir $@)
$(CC) -O2 -I$(TOPDIR)/tools/include -o $@ $<
-prereq: $(STAGING_DIR_HOST)/bin/mkhash
+$(STAGING_DIR_HOST)/bin/xxd: $(SCRIPT_DIR)/xxdi.pl
+ $(LN) $< $@
+
+prereq: $(STAGING_DIR_HOST)/bin/mkhash $(STAGING_DIR_HOST)/bin/xxd
# Install ldconfig stub
$(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \
More information about the lede-commits
mailing list