diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2019-04-02 08:17:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-03 14:50:13 +0100 |
| commit | 35bd1759d50be578079b53664466c53b2fa69b79 (patch) | |
| tree | 296e8c8c37da640bcc69b4ba8370cc82c1288cfb /meta | |
| parent | 20ebaff9ee9d7392eb02b5df1391efbfedd3bba5 (diff) | |
| download | poky-35bd1759d50be578079b53664466c53b2fa69b79.tar.gz | |
cml1.bbclass: Use POSIX sh instead of var-SHELL
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.
(From OE-Core rev: 50d3ec1ac994fb5968d8edf82823a7e3d1d67d21)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/cml1.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 7f6df4011b..98d24cec74 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass | |||
| @@ -26,7 +26,7 @@ python do_menuconfig() { | |||
| 26 | except OSError: | 26 | except OSError: |
| 27 | mtime = 0 | 27 | mtime = 0 |
| 28 | 28 | ||
| 29 | 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'), | 29 | 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'), |
| 30 | d.getVar('PN') + ' Configuration', d) | 30 | d.getVar('PN') + ' Configuration', d) |
| 31 | 31 | ||
| 32 | # FIXME this check can be removed when the minimum bitbake version has been bumped | 32 | # FIXME this check can be removed when the minimum bitbake version has been bumped |