From b8f33f3f0a1e24f89151743d5c0b82efe45a9df1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 29 Aug 2017 14:45:26 +0300 Subject: signing-keys: do not use DISTRO_VERSION in key names DISTRO_VERSION may contain the current date, and so is prone to mismatches particularly when keys are created on one date, and dnf is configured to use the keys on another date. [YOCTO #11983] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index d43d729203..ef06881311 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -561,7 +561,7 @@ class RpmPM(PackageManager): if self.d.getVar('PACKAGE_FEED_SIGN') == '1': gpg_opts = 'repo_gpgcheck=1\n' - gpg_opts += 'gpgkey=file://%s/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-%s\n' % (self.d.getVar('sysconfdir'), self.d.getVar('DISTRO_VERSION')) + gpg_opts += 'gpgkey=file://%s/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-%s-%s\n' % (self.d.getVar('sysconfdir'), self.d.getVar('DISTRO'), self.d.getVar('DISTRO_CODENAME')) else: gpg_opts = '' -- cgit 1.2.3-korg