From 4581e2c3e65178c3fb38cc0598382c69914abe51 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 22 Mar 2017 14:43:36 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/sign_rpm.bbclass | 7 ------- 1 file changed, 7 deletions(-) (limited to 'meta/classes') 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 () { for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'): if not d.getVar(var): raise_sanity_error("You need to define %s in the config" % var, d) - - # Set the expected location of the public key - d.setVar('RPM_GPG_PUBKEY', os.path.join(d.getVar('STAGING_DIR_TARGET', False), - d.getVar('sysconfdir', False), - 'pki', - 'rpm-gpg', - 'RPM-GPG-KEY-${DISTRO_VERSION}')) } python sign_rpm () { -- cgit v1.2.3-54-g00ecf