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-22 15:09:26 +0000 |
| commit | 74ea979044368dc28c24325e7e77471b70aa8fe8 (patch) | |
| tree | 8b124f39d3ef99eac54a69ed189d97fb4b10d751 /meta/lib | |
| parent | f633abed51ed19522340b1d923ffc12ed7e291d6 (diff) | |
| download | openembedded-core-74ea979044368dc28c24325e7e77471b70aa8fe8.tar.gz openembedded-core-74ea979044368dc28c24325e7e77471b70aa8fe8.tar.bz2 openembedded-core-74ea979044368dc28c24325e7e77471b70aa8fe8.zip | |
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]
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/signing.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 2a4df61998..8b2b33106e 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -520,7 +520,9 @@ class RpmPM(PackageManager): open(platformconfdir + "macros", 'a').write("%_prefer_color 7") if self.d.getVar('RPM_SIGN_PACKAGES') == '1': - pubkey_path = self.d.getVar('RPM_GPG_PUBKEY') + signer = get_signer(self.d, self.d.getVar('RPM_GPG_BACKEND')) + pubkey_path = oe.path.join(self.d.getVar('B'), 'rpm-key') + signer.export_pubkey(pubkey_path, self.d.getVar('RPM_GPG_NAME')) rpm_bin = bb.utils.which(os.getenv('PATH'), "rpmkeys") cmd = [rpm_bin, '--root=%s' % self.target_rootfs, '--import', pubkey_path] try: diff --git a/meta/lib/oeqa/selftest/signing.py b/meta/lib/oeqa/selftest/signing.py index c1dd801400..0ac3d1fac9 100644 --- a/meta/lib/oeqa/selftest/signing.py +++ b/meta/lib/oeqa/selftest/signing.py @@ -51,7 +51,6 @@ class Signing(oeSelfTest): feature = 'INHERIT += "sign_rpm"\n' feature += 'RPM_GPG_PASSPHRASE = "test123"\n' feature += 'RPM_GPG_NAME = "testuser"\n' - feature += 'RPM_GPG_PUBKEY = "%s"\n' % self.pub_key_path feature += 'GPG_PATH = "%s"\n' % self.gpg_dir self.write_config(feature) |