Add ciq grub2 provides ciq8 - #9
Closed
jason-rodri wants to merge 5 commits into
Closed
Conversation
The CIQ shim must not boot upstream RESF grub2 (it lacks the grub.ciq_rocky SBAT entry and is not signed by the key the shim trusts). A version pin is unsafe: a newer Rocky grub2 would satisfy the range but still be wrong. Add ciq-grub2 and ciq-grub2-<efiarch> Provides to the EFI variant package so the shim can Requires the token directly. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Bump Release .0.1.3 -> .0.1.4 so the committed branch matches the deployed artifacts and the transfer/sign pipeline (which already reference .0.1.4). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Same fix as el9: grub2-pc requires grub2-pc-modules of equal EVR, but x86_64 had with_legacy_modules 0, so the modules subpackage was never built -> grub2-pc is uninstallable / blocks dnf upgrade on any box with stock grub2-pc installed. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Addresses josephtate review comment on PR #5 — the .0.1.4 changelog only mentioned the Epoch bump; add the grub2-pc-modules/with_legacy_modules bullet so the change is documented in the spec. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
.0.1.4's changelog entry claims the with_legacy_modules fix (grub2-pc-modules on x86_64), but that fix was edited into the spec in place under the same release number after .0.1.4 had already been published. Real repos and our own reference build both confirm grub2-pc-modules is missing from .0.1.4. Republishing under the same NVR isn't safe, so this is a release bump only -- no other changes; the with_legacy_modules fix itself was already correct. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
Updates the CIQ grub2 RPM packaging metadata to ensure CIQ builds outrank upstream/Rocky packages and to adjust subpackage build/provide behavior for CIQ’s stack.
Changes:
- Bump
Epochto 5 and CIQReleaseto...0.1.5. - Enable legacy module builds on
x86_64(with_legacy_modules 1) to ensuregrub2-pc-modulesis produced. - Add
ciq-grub2*virtualProvideswithin the EFI variant macro (secureboot arches).
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
SPECS/grub2.spec |
Bumps Epoch/Release and adds new changelog entries describing CIQ packaging intent. |
SOURCES/grub.macros |
Enables legacy module builds on x86_64 and adds CIQ-specific Provides in the EFI variant macro. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+546
to
+550
| * Fri Jul 31 2026 Jason Rodriguez <jrodriguez@ciq.com> - 2.02-167.ciq.0.1.5 | ||
| - Release bump only: .0.1.4 was already published without the with_legacy_modules | ||
| fix below despite the changelog entry claiming it (spec was edited in place | ||
| post-publish instead of getting a new release). Republishing under the same | ||
| NVR isn't safe, so this rebuild carries no other changes. |
Comment on lines
293
to
299
| # Add ciq-shim requirement, ONLY on ciq secureboot supported arches \ | ||
| %ifarch x86_64 aarch64 \ | ||
| Requires: ciq-shim >= 15.8 \ | ||
| Provides: ciq-grub2 = %{evr} \ | ||
| Provides: ciq-grub2-%{1} = %{evr} \ | ||
| %endif \ | ||
| %{?legacy_provides:Provides: %{name} = %{evr}} \ |
4 tasks
Contributor
Author
|
Superseded by #10 — this branch was already merged into ciq8 once (PR #5), so its older commits now exist on ciq8 under different SHAs from the squash/rebase-merge, causing a conflict. #10 is a fresh branch off ciq8's current tip with just the one new commit (the .0.1.5 release bump) cherry-picked on top. |
This file contains hidden or 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
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.
No description provided.