summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 14:12:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-06 16:26:52 +0000
commitbc8748d404fb5aa240edc4d2dae8564d292e33f9 (patch)
tree52962d392ad0376dd514756a73c85032a044fc49
parent22861a4dadb49fb440d22ef75feefe50ee3bacb3 (diff)
downloadpoky-bc8748d404fb5aa240edc4d2dae8564d292e33f9.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) (From OE-Core rev: ad65659c124095b660a71d508510a52ab7bb0ce5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/runtime_test.py4
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 25270b7535..cf3a4151f1 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -148,10 +148,12 @@ class TestImage(OESelftestTestCase):
148 features += 'EXTRA_IMAGE_FEATURES += "package-management"\n' 148 features += 'EXTRA_IMAGE_FEATURES += "package-management"\n'
149 features += 'PACKAGE_CLASSES = "package_rpm"\n' 149 features += 'PACKAGE_CLASSES = "package_rpm"\n'
150 150
151 bitbake('gnupg-native -c addto_recipe_sysroot')
152
151 # Enable package feed signing 153 # Enable package feed signing
152 self.gpg_home = tempfile.mkdtemp(prefix="oeqa-feed-sign-") 154 self.gpg_home = tempfile.mkdtemp(prefix="oeqa-feed-sign-")
153 signing_key_dir = os.path.join(self.testlayer_path, 'files', 'signing') 155 signing_key_dir = os.path.join(self.testlayer_path, 'files', 'signing')
154 runCmd('gpg --batch --homedir %s --import %s' % (self.gpg_home, os.path.join(signing_key_dir, 'key.secret'))) 156 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"))
155 features += 'INHERIT += "sign_package_feed"\n' 157 features += 'INHERIT += "sign_package_feed"\n'
156 features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n' 158 features += 'PACKAGE_FEED_GPG_NAME = "testuser"\n'
157 features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase') 159 features += 'PACKAGE_FEED_GPG_PASSPHRASE_FILE = "%s"\n' % os.path.join(signing_key_dir, 'key.passphrase')