diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 14:12:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-13 17:38:07 +0100 |
commit | 1110b68dda41f5cdc849ec01afff5c4b45cd90aa (patch) | |
tree | 31a2d3f6dcb8403ceac95ef273f4efe8c3448f4f | |
parent | 0b22cc4407e7de7d43577e925178500ef54a4bf0 (diff) | |
download | poky-1110b68dda41f5cdc849ec01afff5c4b45cd90aa.tar.gz |
oeqa/selftest/runtime_test: Ensure we build/use gnupg-native
Without this, we see errors if gpg is missing from the host system
for "oe-selftest -r runtime_test.TestImage.test_testimage_dnf".
(From OE-Core rev: e91838b63b506e2969582b2b8511fd3724d6aa3f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/selftest/cases/runtime_test.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index abd0723146..906e460d4f 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py | |||
@@ -149,10 +149,12 @@ class TestImage(OESelftestTestCase): | |||
149 | features += 'EXTRA_IMAGE_FEATURES += "package-management"\n' | 149 | features += 'EXTRA_IMAGE_FEATURES += "package-management"\n' |
150 | features += 'PACKAGE_CLASSES = "package_rpm"\n' | 150 | features += 'PACKAGE_CLASSES = "package_rpm"\n' |
151 | 151 | ||
152 | bitbake('gnupg-native -c addto_recipe_sysroot') | ||
153 | |||
152 | # Enable package feed signing | 154 | # Enable package feed signing |
153 | self.gpg_home = tempfile.mkdtemp(prefix="oeqa-feed-sign-") | 155 | self.gpg_home = tempfile.mkdtemp(prefix="oeqa-feed-sign-") |
154 | signing_key_dir = os.path.join(self.testlayer_path, 'files', 'signing') | 156 | signing_key_dir = os.path.join(self.testlayer_path, 'files', 'signing') |
155 | runCmd('gpg --batch --homedir %s --import %s' % (self.gpg_home, os.path.join(signing_key_dir, 'key.secret'))) | 157 | runCmd('gpg --batch --homedir %s --import %s' % (self.gpg_home, os.path.join(signing_key_dir, 'key.secret')), native_sysroot=get_bb_var("RECIPE_SYSROOT_NATIVE", "gnupg-native")) |
156 | features += 'INHERIT += "sign_package_feed"\n' | 158 | features += 'INHERIT += "sign_package_feed"\n' |
157 | features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n' | 159 | features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n' |
158 | features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase') | 160 | features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase') |