summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/meta/signing-keys.bb
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-12-14 21:13:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-16 10:23:23 +0000
commitc4e2c59088765d1f1de7ec57cde91980f887c2ff (patch)
treea2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-core/meta/signing-keys.bb
parentd5e67725ac11e3296cad104470931ffa16824b90 (diff)
downloadpoky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/meta/signing-keys.bb')
-rw-r--r--meta/recipes-core/meta/signing-keys.bb18
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb
index d088c0c88c..aaa01d0c34 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/meta/recipes-core/meta/signing-keys.bb
@@ -21,23 +21,23 @@ FILES_${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg"
21python do_get_public_keys () { 21python do_get_public_keys () {
22 from oe.gpg_sign import get_signer 22 from oe.gpg_sign import get_signer
23 23
24 if d.getVar("RPM_SIGN_PACKAGES", True): 24 if d.getVar("RPM_SIGN_PACKAGES"):
25 # Export public key of the rpm signing key 25 # Export public key of the rpm signing key
26 signer = get_signer(d, d.getVar('RPM_GPG_BACKEND', True)) 26 signer = get_signer(d, d.getVar('RPM_GPG_BACKEND'))
27 signer.export_pubkey(os.path.join(d.expand('${B}'), 'rpm-key'), 27 signer.export_pubkey(os.path.join(d.expand('${B}'), 'rpm-key'),
28 d.getVar('RPM_GPG_NAME', True)) 28 d.getVar('RPM_GPG_NAME'))
29 29
30 if d.getVar("IPK_SIGN_PACKAGES", True): 30 if d.getVar("IPK_SIGN_PACKAGES"):
31 # Export public key of the ipk signing key 31 # Export public key of the ipk signing key
32 signer = get_signer(d, d.getVar('IPK_GPG_BACKEND', True)) 32 signer = get_signer(d, d.getVar('IPK_GPG_BACKEND'))
33 signer.export_pubkey(os.path.join(d.expand('${B}'), 'ipk-key'), 33 signer.export_pubkey(os.path.join(d.expand('${B}'), 'ipk-key'),
34 d.getVar('IPK_GPG_NAME', True)) 34 d.getVar('IPK_GPG_NAME'))
35 35
36 if d.getVar('PACKAGE_FEED_SIGN', True) == '1': 36 if d.getVar('PACKAGE_FEED_SIGN') == '1':
37 # Export public key of the feed signing key 37 # Export public key of the feed signing key
38 signer = get_signer(d, d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) 38 signer = get_signer(d, d.getVar('PACKAGE_FEED_GPG_BACKEND'))
39 signer.export_pubkey(os.path.join(d.expand('${B}'), 'pf-key'), 39 signer.export_pubkey(os.path.join(d.expand('${B}'), 'pf-key'),
40 d.getVar('PACKAGE_FEED_GPG_NAME', True)) 40 d.getVar('PACKAGE_FEED_GPG_NAME'))
41} 41}
42do_get_public_keys[cleandirs] = "${B}" 42do_get_public_keys[cleandirs] = "${B}"
43addtask get_public_keys before do_install 43addtask get_public_keys before do_install