mirror of
https://git.yoctoproject.org/poky
synced 2026-02-09 02:03:04 +01:00
666a30a5be
After the below commit introduced, the shebang size of native scripts is also checked, so rework the patch to fix the gap. 377fe11bc0 insane.bbclass: Make do_qa_staging check shebangs Fixes: ERROR: QA Issue: : /work/x86_64-linux/vim-native/9.0.0005-r0/sysroot-destdir/work/x86_64-linux/vim-native/9.0.0005-r0/recipe-sysroot-native/usr/share/vim/vim90/tools/mve.awk maximum shebang size exceeded, the maximum size is 128. [shebang-size] ERROR: QA Issue: : /work/x86_64-linux/vim-native/9.0.0005-r0/sysroot-destdir/work/x86_64-linux/vim-native/9.0.0005-r0/recipe-sysroot-native/usr/share/vim/vim90/tools/efm_perl.pl maximum shebang size exceeded, the maximum size is 128. [shebang-size] (From OE-Core rev: 79232458b9cdc741a2049d83839af73f58a5554c) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 4125a1ccb82fd53d003acdc34e462f238f0c4f0d Mon Sep 17 00:00:00 2001
|
|
From: Joe Slater <joe.slater@windriver.com>
|
|
Date: Fri, 8 Jul 2022 11:03:22 +0800
|
|
Subject: [PATCH] vim: do not adjust script pathnames
|
|
|
|
When cross-compiling, we do not want to reference the host versions of
|
|
things like perl and awk.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
---
|
|
src/Makefile | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index c9513a632..7a7cbdc43 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -2534,11 +2534,7 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
|
|
rm -rf $$cvs; \
|
|
fi
|
|
-chmod $(FILEMOD) $(DEST_TOOLS)/*
|
|
-# replace the path in some tools
|
|
- perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
|
|
- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
|
- awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
|
- awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
|
|
+# not replace the path in some tools
|
|
-chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
|
|
|
|
# install the language specific files for tools, if they were unpacked
|
|
--
|
|
2.25.1
|
|
|