From 0625f7997249d4161b59f3b6fde2f6e9ffbb621c Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Tue, 17 Oct 2023 13:56:12 -0400
Subject: [PATCH] repositories: Correctly handle repository configuration and
 signing keys

Since kiwi 9.25.16, it is now possible to use the $releasever variable
to get the correct GPG key file path. This minimizes the changes
required to branch from rawhide to simply changing the release-version
value in the config.xml and switching the symlink for repositories/core.xml.
---
 repositories/asahi.xml           |  2 +-
 repositories/core-nonrawhide.xml | 12 ++++++++++++
 repositories/core-rawhide.xml    |  7 +++++++
 repositories/core.xml            |  8 +-------
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 repositories/core-nonrawhide.xml
 create mode 100644 repositories/core-rawhide.xml
 mode change 100644 => 120000 repositories/core.xml

diff --git a/repositories/asahi.xml b/repositories/asahi.xml
index 007ff97..3f59278 100644
--- a/repositories/asahi.xml
+++ b/repositories/asahi.xml
@@ -26,7 +26,7 @@
 	</repository>
 	<repository type="rpm-md" alias="fedora-asahi-remix-hotfixes" priority="1">
 		<source path="https://fedora-asahi-remix.org/repos/hotfixes/$releasever/">
-			<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primary"/>
+			<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>
 		</source>
 	</repository>
 </image>
diff --git a/repositories/core-nonrawhide.xml b/repositories/core-nonrawhide.xml
new file mode 100644
index 0000000..d6ed79f
--- /dev/null
+++ b/repositories/core-nonrawhide.xml
@@ -0,0 +1,12 @@
+<image>
+	<repository type="rpm-md" alias="fedora" sourcetype="metalink">
+		<source path="https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&amp;arch=$basearch">
+			<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>
+		</source>
+	</repository>
+        <repository type="rpm-md" alias="updates" sourcetype="metalink">
+                <source path="https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&amp;arch=$basearch">
+                        <signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>
+                </source>
+        </repository>
+</image>
diff --git a/repositories/core-rawhide.xml b/repositories/core-rawhide.xml
new file mode 100644
index 0000000..c2ae124
--- /dev/null
+++ b/repositories/core-rawhide.xml
@@ -0,0 +1,7 @@
+<image>
+	<repository type="rpm-md" alias="rawhide" sourcetype="metalink">
+		<source path="https://mirrors.fedoraproject.org/metalink?repo=rawhide&amp;arch=$basearch">
+			<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primary"/>
+		</source>
+	</repository>
+</image>
diff --git a/repositories/core.xml b/repositories/core.xml
deleted file mode 100644
index c2ae124..0000000
--- a/repositories/core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<image>
-	<repository type="rpm-md" alias="rawhide" sourcetype="metalink">
-		<source path="https://mirrors.fedoraproject.org/metalink?repo=rawhide&amp;arch=$basearch">
-			<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-rawhide-primary"/>
-		</source>
-	</repository>
-</image>
diff --git a/repositories/core.xml b/repositories/core.xml
new file mode 120000
index 0000000..95dc008
--- /dev/null
+++ b/repositories/core.xml
@@ -0,0 +1 @@
+core-rawhide.xml
\ No newline at end of file