diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-02-16 16:36:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-15 11:01:17 +0100 |
commit | fce38c70d4cb0869eb6ddf1627dd8ee9b84a82d6 (patch) | |
tree | 00e57a77055ec5886d9c9b1170a9e686cfb43680 | |
parent | d66a52219b8d734ba3728146e1e5533c17db0eb4 (diff) | |
download | poky-fce38c70d4cb0869eb6ddf1627dd8ee9b84a82d6.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)
(From OE-Core rev: 9ef0bbcc319676436ddce0bab3f599288f57852e)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.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 02e5f5ad29..9f501a5ea0 100644 --- a/meta/lib/oeqa/selftest/signing.py +++ b/meta/lib/oeqa/selftest/signing.py | |||
@@ -104,13 +104,7 @@ class Signing(oeSelfTest): | |||
104 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) | 104 | self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe) |
105 | self.add_command_to_tearDown('rm -rf %s' % sstatedir) | 105 | self.add_command_to_tearDown('rm -rf %s' % sstatedir) |
106 | 106 | ||
107 | # Determine the pub key signature | 107 | feature = 'SSTATE_SIG_KEY ?= "testuser"\n' |
108 | ret = runCmd('gpg --homedir %s --list-keys' % self.gpg_dir) | ||
109 | pub_key = re.search(r'^pub\s+\S+/(\S+)\s+', ret.output, re.M) | ||
110 | self.assertIsNotNone(pub_key, 'Failed to determine the public key signature.') | ||
111 | pub_key = pub_key.group(1) | ||
112 | |||
113 | feature = 'SSTATE_SIG_KEY ?= "%s"\n' % pub_key | ||
114 | feature += 'SSTATE_SIG_PASSPHRASE ?= "test123"\n' | 108 | feature += 'SSTATE_SIG_PASSPHRASE ?= "test123"\n' |
115 | feature += 'SSTATE_VERIFY_SIG ?= "1"\n' | 109 | feature += 'SSTATE_VERIFY_SIG ?= "1"\n' |
116 | feature += 'GPG_PATH = "%s"\n' % self.gpg_dir | 110 | feature += 'GPG_PATH = "%s"\n' % self.gpg_dir |