diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-02-18 08:46:39 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-19 01:01:24 +0000 |
| commit | a3b996ae6ddbaab834531ad8f2c2cf18b6f440a9 (patch) | |
| tree | 005a86f43a39cb5f7db5c3203b023ffd3a4db695 | |
| parent | 91bfe50b234c60506befab477d3b6f5c5745c9f9 (diff) | |
| download | poky-a3b996ae6ddbaab834531ad8f2c2cf18b6f440a9.tar.gz | |
cml1.bbclass: fix do_menuconfig
The functionality got broken after bitbake commit
8bf33a8e92c0e188fa392030025756196c96fcbb
which disabled the (bitbake) variable expansion inside python functions.
(From OE-Core rev: 51c6ea30060eeddf93e4255cbd3847fc6aedaf9f)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/cml1.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 95cf584ad8..4067dc0fba 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass | |||
| @@ -26,7 +26,8 @@ python do_menuconfig() { | |||
| 26 | except OSError: | 26 | except OSError: |
| 27 | mtime = 0 | 27 | mtime = 0 |
| 28 | 28 | ||
| 29 | oe_terminal("${SHELL} -c \"make ${KCONFIG_CONFIG_COMMAND}; if [ \$? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d) | 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'), |
| 30 | d.getVar('PN', True ) + ' Configuration', d) | ||
| 30 | 31 | ||
| 31 | # 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 |
| 32 | if hasattr(bb.build, 'write_taint'): | 33 | if hasattr(bb.build, 'write_taint'): |