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.
This commit is contained in:
Neal Gompa 2023-10-17 13:56:12 -04:00
parent 547e94a238
commit 0625f79972
4 changed files with 21 additions and 8 deletions

View File

@ -26,7 +26,7 @@
</repository> </repository>
<repository type="rpm-md" alias="fedora-asahi-remix-hotfixes" priority="1"> <repository type="rpm-md" alias="fedora-asahi-remix-hotfixes" priority="1">
<source path="https://fedora-asahi-remix.org/repos/hotfixes/$releasever/"> <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> </source>
</repository> </repository>
</image> </image>

View File

@ -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>

View File

@ -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>

View File

@ -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>

1
repositories/core.xml Symbolic link
View File

@ -0,0 +1 @@
core-rawhide.xml