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:33:02 +0000 |
commit | 78b610944049c611f30a947895a5db7edc171393 (patch) | |
tree | 5aa0726329fcba0d3c4d575b54ebe23d63cfd45d /meta | |
parent | 7e19f88e13b8433721797084c4f02d4d08050da5 (diff) | |
download | poky-78b610944049c611f30a947895a5db7edc171393.tar.gz |
cml1/sstate: Fix missing getVar parameter
(From OE-Core rev: 84065e9b33e6d401e4e50436665838be2d0267ad)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 4067dc0fba..b5dc028a2b 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("${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), |
30 | d.getVar('PN', True ) + ' Configuration', d) | 30 | d.getVar('PN', True ) + ' 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 |
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 6c20f69c57..3499d2ee66 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -691,8 +691,8 @@ python sstate_sign_package () { | |||
691 | sstate_pkg = d.getVar('SSTATE_PKG', True) | 691 | sstate_pkg = d.getVar('SSTATE_PKG', True) |
692 | if os.path.exists(sstate_pkg + '.sig'): | 692 | if os.path.exists(sstate_pkg + '.sig'): |
693 | os.unlink(sstate_pkg + '.sig') | 693 | os.unlink(sstate_pkg + '.sig') |
694 | signer.detach_sign(sstate_pkg, d.getVar('SSTATE_SIG_KEY'), None, | 694 | signer.detach_sign(sstate_pkg, d.getVar('SSTATE_SIG_KEY', False), None, |
695 | d.getVar('SSTATE_SIG_PASSPHRASE'), armor=False) | 695 | d.getVar('SSTATE_SIG_PASSPHRASE', True), armor=False) |
696 | } | 696 | } |
697 | 697 | ||
698 | # | 698 | # |