]> code.ossystems Code Review - openembedded-core.git/commitdiff
cml1.bbclass: Use POSIX sh instead of var-SHELL
authorNathan Rossi <nathan@nathanrossi.com>
Tue, 2 Apr 2019 08:17:39 +0000 (08:17 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 3 Apr 2019 13:46:57 +0000 (14:46 +0100)
Use the default POSIX sh instead of relying of var-SHELL being set to a
compatible shell. Such that in cases where SHELL is set to a
incompatible shell (e.g. csh, zsh, fish, etc.) the terminal command does
not just silently fail.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/cml1.bbclass

index 7f6df4011bc0c924438cce4abdb3921ddff6b6c4..98d24cec746bf79239699c15d2c0734af3e8cdaf 100644 (file)
@@ -26,7 +26,7 @@ python do_menuconfig() {
     except OSError:
         mtime = 0
 
-    oe_terminal("${SHELL} -c \"make %s; if [ \\$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND'),
+    oe_terminal("sh -c \"make %s; if [ \\$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"" % d.getVar('KCONFIG_CONFIG_COMMAND'),
                 d.getVar('PN') + ' Configuration', d)
 
     # FIXME this check can be removed when the minimum bitbake version has been bumped