diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-03-22 14:43:36 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-23 13:19:49 +0000 |
commit | 4581e2c3e65178c3fb38cc0598382c69914abe51 (patch) | |
tree | a0bc64aa95db63e165adfa8a7b22065113686443 /meta/classes | |
parent | 0a435c7e6ac88c5e099b12f6a90cd96155fe18f2 (diff) | |
download | poky-4581e2c3e65178c3fb38cc0598382c69914abe51.tar.gz |
sign_rpm.bbclass: do not set/use RPM_GPG_PUBKEY
This is entirely unnecessary (we can ask the signer backend to export the
key to a file when needed), and was causing confusing selftest failures
due to the variable being set from two different places.
[YOCTO #11191]
(From OE-Core rev: 74ea979044368dc28c24325e7e77471b70aa8fe8)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sign_rpm.bbclass | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/meta/classes/sign_rpm.bbclass b/meta/classes/sign_rpm.bbclass index 2a08020819..bc2e947107 100644 --- a/meta/classes/sign_rpm.bbclass +++ b/meta/classes/sign_rpm.bbclass | |||
@@ -28,13 +28,6 @@ python () { | |||
28 | for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'): | 28 | for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'): |
29 | if not d.getVar(var): | 29 | if not d.getVar(var): |
30 | raise_sanity_error("You need to define %s in the config" % var, d) | 30 | raise_sanity_error("You need to define %s in the config" % var, d) |
31 | |||
32 | # Set the expected location of the public key | ||
33 | d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_DIR_TARGET', False), | ||
34 | d.getVar('sysconfdir', False), | ||
35 | 'pki', | ||
36 | 'rpm-gpg', | ||
37 | 'RPM-GPG-KEY-${DISTRO_VERSION}')) | ||
38 | } | 31 | } |
39 | 32 | ||
40 | python sign_rpm () { | 33 | python sign_rpm () { |