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>
This commit is contained in:
parent
0a435c7e6a
commit
4581e2c3e6
|
@ -28,13 +28,6 @@ python () {
|
||||||
for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'):
|
for var in ('RPM_GPG_NAME', 'RPM_GPG_PASSPHRASE'):
|
||||||
if not d.getVar(var):
|
if not d.getVar(var):
|
||||||
raise_sanity_error("You need to define %s in the config" % var, d)
|
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 () {
|
python sign_rpm () {
|
||||||
|
|
|
@ -520,7 +520,9 @@ class RpmPM(PackageManager):
|
||||||
open(platformconfdir + "macros", 'a').write("%_prefer_color 7")
|
open(platformconfdir + "macros", 'a').write("%_prefer_color 7")
|
||||||
|
|
||||||
if self.d.getVar('RPM_SIGN_PACKAGES') == '1':
|
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")
|
rpm_bin = bb.utils.which(os.getenv('PATH'), "rpmkeys")
|
||||||
cmd = [rpm_bin, '--root=%s' % self.target_rootfs, '--import', pubkey_path]
|
cmd = [rpm_bin, '--root=%s' % self.target_rootfs, '--import', pubkey_path]
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -51,7 +51,6 @@ class Signing(oeSelfTest):
|
||||||
feature = 'INHERIT += "sign_rpm"\n'
|
feature = 'INHERIT += "sign_rpm"\n'
|
||||||
feature += 'RPM_GPG_PASSPHRASE = "test123"\n'
|
feature += 'RPM_GPG_PASSPHRASE = "test123"\n'
|
||||||
feature += 'RPM_GPG_NAME = "testuser"\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
|
feature += 'GPG_PATH = "%s"\n' % self.gpg_dir
|
||||||
|
|
||||||
self.write_config(feature)
|
self.write_config(feature)
|
||||||
|
|
Loading…
Reference in New Issue