diff options
-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 () { | |||
144 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) | 144 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) |
145 | 145 | ||
146 | # Some classes are not suitable for SDK, remove them from INHERIT | 146 | # Some classes are not suitable for SDK, remove them from INHERIT |
147 | f.write('INHERIT_remove = "%s"\n' % d.getVar('SDK_INHERIT_BLACKLIST')) | 147 | f.write('INHERIT_remove = "%s"\n' % d.getVar('SDK_INHERIT_BLACKLIST', False)) |
148 | 148 | ||
149 | # Bypass the default connectivity check if any | 149 | # Bypass the default connectivity check if any |
150 | f.write('CONNECTIVITY_CHECK_URIS = ""\n\n') | 150 | 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 () { | |||
24 | 24 | ||
25 | # Set expected location of the public key | 25 | # Set expected location of the public key |
26 | d.setVar('PACKAGE_FEED_GPG_PUBKEY', | 26 | d.setVar('PACKAGE_FEED_GPG_PUBKEY', |
27 | os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'), | 27 | os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False), |
28 | 'PACKAGE-FEED-GPG-PUBKEY')) | 28 | 'PACKAGE-FEED-GPG-PUBKEY')) |
29 | } | 29 | } |
30 | 30 | ||
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 () { | |||
23 | raise_sanity_error("You need to define %s in the config" % var, d) | 23 | raise_sanity_error("You need to define %s in the config" % var, d) |
24 | 24 | ||
25 | # Set the expected location of the public key | 25 | # Set the expected location of the public key |
26 | d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE'), | 26 | d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_ETCDIR_NATIVE', False), |
27 | 'RPM-GPG-PUBKEY')) | 27 | 'RPM-GPG-PUBKEY')) |
28 | } | 28 | } |
29 | 29 | ||