Skip to content

Add ciq grub2 provides ciq8 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jason-rodri wants to merge 5 commits into from
Closed

Add ciq grub2 provides ciq8 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57cd45b
Add ciq-grub2 virtual Provides so shim can require CIQ grub2
jason-rodri Jun 23, 2026
dc265f1
el8 grub2: Epoch 1 -> 5 + Release .ciq.0.1.4 (per release leadership)
jason-rodri Jun 26, 2026
e7d59ad
el8 grub2: build grub2-pc-modules on x86_64 (with_legacy_modules 1)
jason-rodri Jun 26, 2026
b4104a3
el8 grub2: add changelog entry for with_legacy_modules fix
jason-rodri Jun 30, 2026
1509c26
el8 grub2: Release bump to .ciq.0.1.5 -- .0.1.4 shipped without the fix
jason-rodri Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion SOURCES/grub.macros
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,11 @@

%ifarch x86_64
%global with_efi_common 1
%global with_legacy_modules 0
# Build grub2-pc-modules on x86_64 (upstream behavior). Without it, grub2-pc
# requires a sibling that is never built, so it is uninstallable and cannot be
# upgraded in lockstep with the rest of the stack (dnf "protected package"
# removal error on any box that already has the stock grub2-pc).
%global with_legacy_modules 1
%global with_legacy_common 0
%else
%global with_efi_common 0
Expand Down Expand Up @@ -289,6 +293,8 @@ Provides: %{name}-efi = %{evr} \
# 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}} \
Comment on lines 293 to 299
%{-o:Obsoletes: %{name}-efi < %{evr}} \
Expand Down
16 changes: 14 additions & 2 deletions SPECS/grub2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
%global _configure_gnuconfig_hack 0

Name: grub2
Epoch: 1
Epoch: 5
Version: 2.02
Release: 167%{?dist}.ciq.0.1.3
Release: 167%{?dist}.ciq.0.1.5
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
License: GPLv3+
Expand Down Expand Up @@ -543,6 +543,18 @@ fi
%endif

%changelog
* 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 +546 to +550

* Fri Jun 26 2026 Jason Rodriguez <jrodriguez@ciq.com> - 2.02-167.ciq.0.1.4
- Epoch 1 -> 5 so CIQ grub2 outranks Rocky's on a plain dnf upgrade (pairs with shim Epoch 5 + kernel Requires ciq-shim).
- Enable with_legacy_modules on x86_64 so grub2-pc-modules is built; without it
grub2-pc (which Requires grub2-pc-modules) is uninstallable and dnf upgrade
fails with "removing protected packages: grub2-pc" on stock-grub2-pc boxes.

* Thu Apr 03 2026 Linux Engineering <le-team@ciq.com> - 2.02-167.3
- Bump SBAT level grub,3 -> grub,5 to reflect CVE patches already present
- Port patches 0678-0683 from grub2-rl8 (Rocky Linux 8):
Expand Down