From 7e0b77008d2dee7c00a0219fd6f1a2acba82bf87 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 6 Aug 2025 14:56:30 -0400 Subject: [PATCH] tree: move repo files to use GPG keys in /etc/pki/rpm-gpg The use of distribution-gpg-keys for these repo files is ancient; the first occurrence is 342e8813 ("Switch to f29, add fedora-release-coreos") which doesn't have a rationale for it. However, in practice today FCOS is currently built only by Fedora-based tools, like cosa and the bootc-base-imagectl in fedora-bootc. So we could just use the `/etc/pki/rpm-gpg` paths there. This allows us to avoid having to install `distribution-gpg-keys` before doing a compose. Note that `fedora-rawhide.repo` was already using the `/etc` path so we know this works. --- fedora-archive.repo | 4 ++-- fedora-candidate-compose.repo | 2 +- fedora-next.repo | 6 +++--- fedora.repo | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fedora-archive.repo b/fedora-archive.repo index 9a80c383..8898d546 100644 --- a/fedora-archive.repo +++ b/fedora-archive.repo @@ -20,7 +20,7 @@ enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False [fedora-archive-updates] @@ -35,5 +35,5 @@ enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False diff --git a/fedora-candidate-compose.repo b/fedora-candidate-compose.repo index b408da25..3de24426 100644 --- a/fedora-candidate-compose.repo +++ b/fedora-candidate-compose.repo @@ -17,5 +17,5 @@ enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False diff --git a/fedora-next.repo b/fedora-next.repo index b7cc9bc7..a0977506 100644 --- a/fedora-next.repo +++ b/fedora-next.repo @@ -11,7 +11,7 @@ enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False [fedora-next-updates] @@ -24,7 +24,7 @@ repo_gpgcheck=0 type=rpm gpgcheck=1 metadata_expire=6h -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False [fedora-next-updates-testing] @@ -35,5 +35,5 @@ baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releaseve enabled=1 gpgcheck=1 metadata_expire=6h -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False diff --git a/fedora.repo b/fedora.repo index 4b1fdd7f..3a16cf38 100644 --- a/fedora.repo +++ b/fedora.repo @@ -11,7 +11,7 @@ enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False [fedora-updates] @@ -24,7 +24,7 @@ repo_gpgcheck=0 type=rpm gpgcheck=1 metadata_expire=6h -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False [fedora-updates-testing] @@ -35,5 +35,5 @@ baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releaseve enabled=1 gpgcheck=1 metadata_expire=6h -gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary skip_if_unavailable=False