aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-02-18 08:46:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 22:55:10 +0000
commit51c6ea30060eeddf93e4255cbd3847fc6aedaf9f (patch)
treee6ccf55fd249fac4be6bd333d4d76e0792499f02
parente6cd13770b19e221cfd5d66fe36138f6e1de0158 (diff)
downloadopenembedded-core-contrib-51c6ea30060eeddf93e4255cbd3847fc6aedaf9f.tar.gz
openembedded-core-contrib-51c6ea30060eeddf93e4255cbd3847fc6aedaf9f.tar.bz2
openembedded-core-contrib-51c6ea30060eeddf93e4255cbd3847fc6aedaf9f.zip
cml1.bbclass: fix do_menuconfig
The functionality got broken after bitbake commit 8bf33a8e92c0e188fa392030025756196c96fcbb which disabled the (bitbake) variable expansion inside python functions. 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.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 95cf584ad8e..4067dc0fba4 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -26,7 +26,8 @@ python do_menuconfig() {
except OSError:
mtime = 0
- 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)
+ 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'),
+ d.getVar('PN', True ) + ' Configuration', d)
# FIXME this check can be removed when the minimum bitbake version has been bumped
if hasattr(bb.build, 'write_taint'):