diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/sign_ipk.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-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/classes/sign_ipk.bbclass')
-rw-r--r-- | meta/classes/sign_ipk.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/sign_ipk.bbclass b/meta/classes/sign_ipk.bbclass index a481f6d9a8..e5057b7799 100644 --- a/meta/classes/sign_ipk.bbclass +++ b/meta/classes/sign_ipk.bbclass | |||
@@ -29,10 +29,10 @@ IPK_GPG_SIGNATURE_TYPE ?= 'ASC' | |||
29 | python () { | 29 | python () { |
30 | # Check configuration | 30 | # Check configuration |
31 | for var in ('IPK_GPG_NAME', 'IPK_GPG_PASSPHRASE_FILE'): | 31 | for var in ('IPK_GPG_NAME', 'IPK_GPG_PASSPHRASE_FILE'): |
32 | if not d.getVar(var, True): | 32 | if not d.getVar(var): |
33 | raise_sanity_error("You need to define %s in the config" % var, d) | 33 | raise_sanity_error("You need to define %s in the config" % var, d) |
34 | 34 | ||
35 | sigtype = d.getVar("IPK_GPG_SIGNATURE_TYPE", True) | 35 | sigtype = d.getVar("IPK_GPG_SIGNATURE_TYPE") |
36 | if sigtype.upper() != "ASC" and sigtype.upper() != "BIN": | 36 | if sigtype.upper() != "ASC" and sigtype.upper() != "BIN": |
37 | raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype) | 37 | raise_sanity_error("Bad value for IPK_GPG_SIGNATURE_TYPE (%s), use either ASC or BIN" % sigtype) |
38 | } | 38 | } |
@@ -42,11 +42,11 @@ def sign_ipk(d, ipk_to_sign): | |||
42 | 42 | ||
43 | bb.debug(1, 'Signing ipk: %s' % ipk_to_sign) | 43 | bb.debug(1, 'Signing ipk: %s' % ipk_to_sign) |
44 | 44 | ||
45 | signer = get_signer(d, d.getVar('IPK_GPG_BACKEND', True)) | 45 | signer = get_signer(d, d.getVar('IPK_GPG_BACKEND')) |
46 | sig_type = d.getVar('IPK_GPG_SIGNATURE_TYPE', True) | 46 | sig_type = d.getVar('IPK_GPG_SIGNATURE_TYPE') |
47 | is_ascii_sig = (sig_type.upper() != "BIN") | 47 | is_ascii_sig = (sig_type.upper() != "BIN") |
48 | 48 | ||
49 | signer.detach_sign(ipk_to_sign, | 49 | signer.detach_sign(ipk_to_sign, |
50 | d.getVar('IPK_GPG_NAME', True), | 50 | d.getVar('IPK_GPG_NAME'), |
51 | d.getVar('IPK_GPG_PASSPHRASE_FILE', True), | 51 | d.getVar('IPK_GPG_PASSPHRASE_FILE'), |
52 | armor=is_ascii_sig) | 52 | armor=is_ascii_sig) |