From 1cebd3469e295b4b1ae46effe5cf521b5264ee05 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 27 Jan 2020 21:54:13 +0000 Subject: 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 --- meta/recipes-extended/grep/grep_3.4.bb | 3 +-- 1 file changed, 1 insertion(+), 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 acpaths = "-I ./m4" do_configure_prepend () { + sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh rm -f ${S}/m4/init.m4 } @@ -41,5 +42,3 @@ ALTERNATIVE_${PN} = "grep egrep fgrep" ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" - -export CONFIG_SHELL="/bin/sh" -- cgit v1.2.3-54-g00ecf