From 12d97c040043c412dd9e5dd10bef153749c176cf Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 24 Aug 2026 08:31:47 -0400
Subject: [PATCH] Switch our gpg key path locations to /usr/

Part of:

- https://github.com/coreos/fedora-coreos-tracker/issues/2172
- https://fedoraproject.org/wiki/Changes/RelocateRpmRepoConfigsToUsr

Because of [1] we now have the gpgkeys also in /usr on F44 so we can
go ahead and start using those paths everywhere.

[1] https://src.fedoraproject.org/rpms/fedora-repos/c/107895f6f8dc26d329d3e40dbd5ccbabe1e8f301?branch=f44
---
 fedora-candidate-compose.repo                               | 2 +-
 fedora-next.repo                                            | 6 +++---
 fedora-rawhide.repo                                         | 2 +-
 fedora.repo                                                 | 6 +++---
 .../usr/lib/coreos/coreos-containers-policy.json            | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fedora-candidate-compose.repo b/fedora-candidate-compose.repo
index 3de24426..4718d555 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:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 skip_if_unavailable=False
diff --git a/fedora-next.repo b/fedora-next.repo
index a0977506..7372cdfb 100644
--- a/fedora-next.repo
+++ b/fedora-next.repo
@@ -11,7 +11,7 @@ enabled=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+gpgkey=file:///usr/share/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:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+gpgkey=file:///usr/share/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:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 skip_if_unavailable=False
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 674eea33..351f1ea8 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -12,5 +12,5 @@ metadata_expire=6h
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
diff --git a/fedora.repo b/fedora.repo
index 3a16cf38..7a364c73 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -11,7 +11,7 @@ enabled=1
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+gpgkey=file:///usr/share/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:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+gpgkey=file:///usr/share/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:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+gpgkey=file:///usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 skip_if_unavailable=False
diff --git a/overlay.d/17fcos-container-signing/usr/lib/coreos/coreos-containers-policy.json b/overlay.d/17fcos-container-signing/usr/lib/coreos/coreos-containers-policy.json
index f2016bca..a6af56d5 100644
--- a/overlay.d/17fcos-container-signing/usr/lib/coreos/coreos-containers-policy.json
+++ b/overlay.d/17fcos-container-signing/usr/lib/coreos/coreos-containers-policy.json
@@ -44,9 +44,9 @@
           "type": "signedBy",
           "keyType": "GPGKeys",
           "keyPaths": [
-            "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-primary",
-            "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-primary",
-            "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-45-primary"
+            "/usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-primary",
+            "/usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-primary",
+            "/usr/share/pki/rpm-gpg/RPM-GPG-KEY-fedora-45-primary"
           ]
         }
       ]