From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 18 Feb 2016 06:46:39 +0000 (+0200)
Subject: cml1.bbclass: fix do_menuconfig
X-Git-Tag: 2016-4~811
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=51c6ea30060eeddf93e4255cbd3847fc6aedaf9f;p=openembedded-core.git

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>
---

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() {
     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'):