sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

populate_sdk_ext/sign_rpm/sign_package_feed: Add missing getVar parameter 

We should always pass a parameter to getVar, add missing default value.

(From OE-Core rev: 31bc0a46a97d7dc98568a218c077c31d8b11dbd9)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2015-12-10 22:48:35 +00:00
parent 98dcdcb47c
commit 48aad516c2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/populate_sdk_ext.bbclass
View File

@ -144,7 +144,7 @@ python copy_buildsystem () {
f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False))
# Some classes are not suitable for SDK, remove them from INHERIT
f.write('INHERIT_remove = "%s"\n' % d.getVar('SDK_INHERIT_BLACKLIST'))
f.write('INHERIT_remove = "%s"\n' % d.getVar('SDK_INHERIT_BLACKLIST', False))
# Bypass the default connectivity check if any
f.write('CONNECTIVITY_CHECK_URIS = ""\n\n')

2
meta/classes/sign_package_feed.bbclass
View File

@ -24,7 +24,7 @@ python () {
# Set expected location of the public key
d.setVar('PACKAGE_FEED_GPG_PUBKEY',
os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'),
os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False),
'PACKAGE-FEED-GPG-PUBKEY'))
}

2
meta/classes/sign_rpm.bbclass
View File

@ -23,7 +23,7 @@ python () {
raise_sanity_error("You need to define %s in the config" % var, d)
# Set the expected location of the public key
d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'),
d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False),
'RPM-GPG-PUBKEY'))
}