diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-19 15:32:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-19 15:32:56 +0000 |
| commit | 84065e9b33e6d401e4e50436665838be2d0267ad (patch) | |
| tree | 5a07343daedee59b02c6a6c25238148c732cd351 /meta/classes | |
| parent | e864caec7a9b522d86d164ffbaadaa4ea7de0f9b (diff) | |
| download | openembedded-core-contrib-84065e9b33e6d401e4e50436665838be2d0267ad.tar.gz | |
cml1/sstate: Fix missing getVar parameter
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/cml1.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/sstate.bbclass | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 4067dc0fba4..b5dc028a2bb 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass @@ -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("${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', True), d.getVar('PN', True ) + ' Configuration', d) # FIXME this check can be removed when the minimum bitbake version has been bumped diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 6c20f69c57c..3499d2ee66e 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -691,8 +691,8 @@ python sstate_sign_package () { sstate_pkg = d.getVar('SSTATE_PKG', True) if os.path.exists(sstate_pkg + '.sig'): os.unlink(sstate_pkg + '.sig') - signer.detach_sign(sstate_pkg, d.getVar('SSTATE_SIG_KEY'), None, - d.getVar('SSTATE_SIG_PASSPHRASE'), armor=False) + signer.detach_sign(sstate_pkg, d.getVar('SSTATE_SIG_KEY', False), None, + d.getVar('SSTATE_SIG_PASSPHRASE', True), armor=False) } # |