From 019d9128af813cb87b702ae10aa630c79fc24c00 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Wed, 4 Nov 2020 14:35:33 +0100 Subject: 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. Signed-off-by: Andrej Kozemcak Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- meta/classes/autotools.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 () { cfgscript=`python3 -c "import os; print(os.path.relpath(os.path.dirname('${CONFIGURE_SCRIPT}'), '.'))"`/$cfgscript_name if [ -x "$cfgscript" ] ; then bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} $@" - if ! CONFIG_SHELL=/bin/bash ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then + if ! CONFIG_SHELL=${CONFIG_SHELL-/bin/bash} ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then bbnote "The following config.log files may provide further information." bbnote `find ${B} -ignore_readdir_race -type f -name config.log` bbfatal_log "configure failed" -- cgit 1.2.3-korg