mirror of
https://git.yoctoproject.org/poky
synced 2026-09-20 03:49:32 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -22,11 +22,11 @@ RPM_GPG_BACKEND ?= 'local'
|
||||
|
||||
|
||||
python () {
|
||||
if d.getVar('RPM_GPG_PASSPHRASE_FILE', True):
|
||||
if d.getVar('RPM_GPG_PASSPHRASE_FILE'):
|
||||
raise_sanity_error('RPM_GPG_PASSPHRASE_FILE is replaced by RPM_GPG_PASSPHRASE', d)
|
||||
# Check configuration
|
||||
for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'):
|
||||
if not d.getVar(var, True):
|
||||
if not d.getVar(var):
|
||||
raise_sanity_error("You need to define %s in the config" % var, d)
|
||||
|
||||
# Set the expected location of the public key
|
||||
@@ -41,12 +41,12 @@ python sign_rpm () {
|
||||
import glob
|
||||
from oe.gpg_sign import get_signer
|
||||
|
||||
signer = get_signer(d, d.getVar('RPM_GPG_BACKEND', True))
|
||||
rpms = glob.glob(d.getVar('RPM_PKGWRITEDIR', True) + '/*')
|
||||
signer = get_signer(d, d.getVar('RPM_GPG_BACKEND'))
|
||||
rpms = glob.glob(d.getVar('RPM_PKGWRITEDIR') + '/*')
|
||||
|
||||
signer.sign_rpms(rpms,
|
||||
d.getVar('RPM_GPG_NAME', True),
|
||||
d.getVar('RPM_GPG_PASSPHRASE', True))
|
||||
d.getVar('RPM_GPG_NAME'),
|
||||
d.getVar('RPM_GPG_PASSPHRASE'))
|
||||
}
|
||||
|
||||
do_package_index[depends] += "signing-keys:do_deploy"
|
||||
|
||||
Reference in New Issue
Block a user