summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-27 17:37:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-28 11:11:20 +0000
commit93739bca2a88002d1ac5a87ce5453e77304a9c1d (patch)
tree10a94301fa6087434ccd9940a4ab9b4ef67cdc26
parent5c724703c5b411ea0d495c4701f58ae6fd2ec7fd (diff)
downloadpoky-93739bca2a88002d1ac5a87ce5453e77304a9c1d.tar.gz
autotools: Give in and force CONFIG_SHELL to bash
At present, CONFIG_SHELL becomes /bin/sh if its bash and /bin/bash if not. This isn't deterministic and leads to changes in ptest packages which include Makefiles. At first glance you'd think we'd hardcode to /bin/sh since most system shells are sane. Sadly the dash vs. bash leads to quoting differences in configure. The bash default is probably the safest option since configure tries to find bash and this is what most systems would end up using. The end result is a more consisent build environment. [YOCTO #13752] (From OE-Core rev: 33b1e27c29ed05da783f814cf9c3035675087ecc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/autotools.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 3d22ad0255..6c2a33ac72 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -90,7 +90,7 @@ oe_runconf () {
90 cfgscript=`python3 -c "import os; print(os.path.relpath(os.path.dirname('${CONFIGURE_SCRIPT}'), '.'))"`/$cfgscript_name 90 cfgscript=`python3 -c "import os; print(os.path.relpath(os.path.dirname('${CONFIGURE_SCRIPT}'), '.'))"`/$cfgscript_name
91 if [ -x "$cfgscript" ] ; then 91 if [ -x "$cfgscript" ] ; then
92 bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} $@" 92 bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
93 if ! ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then 93 if ! ${CACHED_CONFIGUREVARS} CONFIG_SHELL=/bin/bash $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then
94 bbnote "The following config.log files may provide further information." 94 bbnote "The following config.log files may provide further information."
95 bbnote `find ${B} -ignore_readdir_race -type f -name config.log` 95 bbnote `find ${B} -ignore_readdir_race -type f -name config.log`
96 bbfatal_log "configure failed" 96 bbfatal_log "configure failed"