From: Petr Štetiar <ynezz@true.cz>
Date: Tue, 30 Aug 2022 06:45:39 +0000 (+0200)
Subject: build: provide xxd -i with scripts/xxdi.pl
X-Git-Tag: v21.02.4~23
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1c8c84620de64b20921873c998e93f72dbaccd2a;p=openwrt%2Fstaging%2Fpepe2k.git

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@true.cz>
(cherry picked from commit eae2fb8027cb892e42181e471ba344aa5d26bf7e)
---

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, \