PR#44: repositories: Correctly handle repository configuration and signing keys - fedora-asahi/kiwi-descriptions

fedora-asahi / kiwi-descriptions

#44 repositories: Correctly handle repository configuration and signing keys

Merged 7 months ago by dcavalca. Opened 7 months ago by ngompa.

fixup-core-repocfg into rawhide

repositories: Correctly handle repository configuration and signing keys

Neal Gompa • 7 months ago

0625f79

repositories/asahi.xml

file modified

+1 -1

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

repositories/core-nonrawhide.xml

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ <image>`
		`+ <repository type="rpm-md" alias="fedora" sourcetype="metalink">`
		`+ <source path="https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&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&arch=$basearch">`
		`+ <signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>`
		`+ </source>`
		`+ </repository>`
		`+ </image>`

repositories/core-rawhide.xml ~~repositories/core.xml~~

file renamed

file was moved with no change to the file

repositories/core.xml

file added

		`@@ -0,0 +1,1 @@`
		`+ core-rawhide.xml`
		`\ No newline at end of file`

ngompa commented 7 months ago

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.