diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-02-16 16:36:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-14 14:42:17 +0000 |
commit | 55928d1237ad4026e8db3cc5424127523543b424 (patch) | |
tree | 62e331584ed1c8c62a656c84645622d3dc9528b0 | |
parent | 5a3e1290cbdeef4a8820201d78460a617ee638bd (diff) | |
download | poky-55928d1237ad4026e8db3cc5424127523543b424.tar.gz |
oe-selftest: no need to parse gpg output to determine the name of the signing key
The parsing fails on my machine, and we use a key with a hardcoded name,
and so can provide it directly.
(From OE-Core rev: b69bad2c4e51a24868422f39619a0598fd2a0533)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/selftest/signing.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/lib/oeqa/selftest/signing.py b/meta/lib/oeqa/selftest/signing.py index a9b135aab4..38b2fca8cf 100644 --- a/meta/lib/oeqa/selftest/signing.py +++ b/meta/lib/oeqa/selftest/signing.py | |||
@@ -103,13 +103,7 @@ class Signing(oeSelfTest): | |||
103 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) | 103 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) |
104 | self.add_command_to_tearDown('rm -rf %s' % sstatedir) | 104 | self.add_command_to_tearDown('rm -rf %s' % sstatedir) |
105 | 105 | ||
106 | # Determine the pub key signature | 106 | feature = 'SSTATE_SIG_KEY ?= "testuser"\n' |
107 | ret = runCmd('gpg --homedir %s --list-keys' % self.gpg_dir) | ||
108 | pub_key = re.search(r'^pub\s+\S+/(\S+)\s+', ret.output, re.M) | ||
109 | self.assertIsNotNone(pub_key, 'Failed to determine the public key signature.') | ||
110 | pub_key = pub_key.group(1) | ||
111 | |||
112 | feature = 'SSTATE_SIG_KEY ?= "%s"\n' % pub_key | ||
113 | feature += 'SSTATE_SIG_PASSPHRASE ?= "test123"\n' | 107 | feature += 'SSTATE_SIG_PASSPHRASE ?= "test123"\n' |
114 | feature += 'SSTATE_VERIFY_SIG ?= "1"\n' | 108 | feature += 'SSTATE_VERIFY_SIG ?= "1"\n' |
115 | feature += 'GPG_PATH = "%s"\n' % self.gpg_dir | 109 | feature += 'GPG_PATH = "%s"\n' % self.gpg_dir |