diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2020-11-04 14:35:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-08 14:03:20 +0000 |
commit | fad3498a79c0a6a01034526e47045c9012c193d0 (patch) | |
tree | 46fcc4357fe8d57043cf9605a6371155ad4d3897 /meta | |
parent | da85f7389e8c009378cebdde69a9e0ebb72f9cb0 (diff) | |
download | poky-fad3498a79c0a6a01034526e47045c9012c193d0.tar.gz |
autotools: CONFIG_SHELL defaults
Do not hard-code default shell to /bin/bash even if CONFIG_SHELL is already
set to other shell, but keep /bin/bash as a default. This will fix a shadow
issue, where CONFIG_SHELL is exported to /bin/sh, but /bin/bash is used
even if it's not installed.
(From OE-Core rev: 019d9128af813cb87b702ae10aa630c79fc24c00)
Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com>
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/autotools.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 70804b82b4..2ceb790b5c 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 ! CONFIG_SHELL=/bin/bash ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then | 93 | if ! CONFIG_SHELL=${CONFIG_SHELL-/bin/bash} ${CACHED_CONFIGUREVARS} $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" |