diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-10 22:48:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-14 15:16:04 +0000 |
| commit | 31bc0a46a97d7dc98568a218c077c31d8b11dbd9 (patch) | |
| tree | 1edd8cc2c67f4d71af52063ee5093ee13e4fab1f | |
| parent | 421eb8fce9856c63bf62fc3a61fe39d1e5253ff8 (diff) | |
| download | openembedded-core-31bc0a46a97d7dc98568a218c077c31d8b11dbd9.tar.gz openembedded-core-31bc0a46a97d7dc98568a218c077c31d8b11dbd9.tar.bz2 openembedded-core-31bc0a46a97d7dc98568a218c077c31d8b11dbd9.zip | |
populate_sdk_ext/sign_rpm/sign_package_feed: Add missing getVar parameter
We should always pass a parameter to getVar, add missing default value.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/sign_package_feed.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/sign_rpm.bbclass | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 8601c78410..802cbe1abe 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -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') diff --git a/meta/classes/sign_package_feed.bbclass b/meta/classes/sign_package_feed.bbclass index 4263810028..d89bc0b195 100644 --- a/meta/classes/sign_package_feed.bbclass +++ b/meta/classes/sign_package_feed.bbclass @@ -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')) } diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass index f0c3dc9be3..bc916a7097 100644 --- a/meta/classes/sign_rpm.bbclass +++ b/meta/classes/sign_rpm.bbclass @@ -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')) } |