compose-rootfs: Fix gpgkey= with Fedora examples #5293
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When I added the gpgkey= rewriting, I tested it when using Fedora as a buildroot, targeting CentOS Stream. The relevant thing here is parsing the CS `.repo` files, which just have e.g. `gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256` But Fedora actually uses basearch *and* releasever repo variables: `gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch` Now there aren't actually *per architecture* keys so this never made sense but let's move on. It turns out...it's even harder than that, the rawhide repo file (only) actually uses multiple keys: `gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-$basearch` In order to handle transitory state. Anyways, so the fix here is to: - If we see a `$` in the gpgkey, always rewrite it to reference the source root - Handle multiple keys This fixes doing a build of rawhide, using C10S as the buildroot.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When I added the gpgkey= rewriting, I tested it when using Fedora as a buildroot, targeting CentOS Stream. The relevant thing here is parsing the CS
.repofiles, which just have e.g.gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256But Fedora actually uses basearch and releasever repo variables:
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearchNow there aren't actually per architecture keys so this never made sense but let's move on.
It turns out...it's even harder than that, the rawhide repo file (only) actually uses multiple keys:
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-$basearchIn order to handle transitory state.
Anyways, so the fix here is to:
$in the gpgkey, always rewrite it to reference the source rootThis fixes doing a build of rawhide, using C10S as the buildroot.