summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 21:54:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-28 11:11:20 +0000
commit1cebd3469e295b4b1ae46effe5cf521b5264ee05 (patch)
tree482e7aa9f56adec23783952ad4e2cf6aafe0091b
parent63bb091d2d2f373a221225b7fbe45ed4f2b57650 (diff)
downloadpoky-1cebd3469e295b4b1ae46effe5cf521b5264ee05.tar.gz
grep: Fix shell after autotools changes
After changing autotools.bbclass, CONFIG_SHELL setting no longer works resulting in: grep-3.4-r0 do_package_qa: QA Issue: /bin/fgrep.grep contained in package grep requires /bin/bash, but no providers found in RDEPENDS_grep? [file-rdeps] The script can use /bin/sh so set this specifically using sed since we want to use a consistent shell for the rest of the build but not have the specific bash dependency. (From OE-Core rev: 9031b66c7c817b65f75b429db6f6527d07196e8a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/grep/grep_3.4.bb3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-extended/grep/grep_3.4.bb b/meta/recipes-extended/grep/grep_3.4.bb
index fb8dcec490..e176dd727b 100644
--- a/meta/recipes-extended/grep/grep_3.4.bb
+++ b/meta/recipes-extended/grep/grep_3.4.bb
@@ -16,6 +16,7 @@ inherit autotools gettext texinfo pkgconfig
16acpaths = "-I ./m4" 16acpaths = "-I ./m4"
17 17
18do_configure_prepend () { 18do_configure_prepend () {
19 sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh
19 rm -f ${S}/m4/init.m4 20 rm -f ${S}/m4/init.m4
20} 21}
21 22
@@ -41,5 +42,3 @@ ALTERNATIVE_${PN} = "grep egrep fgrep"
41ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" 42ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep"
42ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" 43ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep"
43ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" 44ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep"
44
45export CONFIG_SHELL="/bin/sh"