Skip to content

el9 grub2 (ciq9): Epoch 3 → 5 (catch up to deployed/tested build) #7

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

el9 grub2 (ciq9): Epoch 3 → 5 (catch up to deployed/tested build) #7

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
b95b865
Add ciq-grub2 virtual Provides so shim can require CIQ grub2
jason-rodri Jun 23, 2026
84e6da4
el9: bump Epoch 1 -> 3 so CIQ grub2 outranks Rocky's on plain dnf upg…
jason-rodri Jun 26, 2026
83f5021
grub.macros: enable with_legacy_modules on x86_64 (completes the .ciq…
jason-rodri Jun 26, 2026
6ed2093
el9 grub2: changelog note for Epoch 1 -> 3
jason-rodri Jun 26, 2026
5ee7842
el9 grub2: Epoch 1 -> 5 (per release leadership)
jason-rodri Jun 26, 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 @@ -216,7 +216,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 @@ -274,6 +278,8 @@ Requires: %{name}-common = %{evr} \
Requires: %{name}-tools-minimal >= %{evr} \
Requires: %{name}-tools = %{evr} \
Provides: %{name}-efi = %{evr} \
Provides: ciq-grub2 = %{evr} \
Provides: ciq-grub2-%{1} = %{evr} \
Requires: ciq-shim >= 15.8 \
%{?legacy_provides:Provides: %{name} = %{evr}} \
%{-o:Obsoletes: %{name}-efi < %{evr}} \
Expand Down
11 changes: 9 additions & 2 deletions SPECS/grub2.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
%global gnulibversion 9f48fb992a3d7e96610c4ce8be969cff2d61a01b

Name: grub2
Epoch: 1
Epoch: 5
Version: 2.06
Release: 114%{?dist}.ciq.0.1
Release: 114%{?dist}.ciq.0.2
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
Expand Down Expand Up @@ -573,6 +573,13 @@ fi
%endif

%changelog
* Wed Jun 24 2026 Jason Rodriguez <jrodriguez@ciq.com> - 2.06-114.ciq.0.2
- 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 and packaged.
Fixes grub2-pc being uninstallable/un-upgradeable (it requires grub2-pc-modules,
which was excluded on x86_64), which caused "removing the following protected
packages: grub2-pc" on any box with the stock grub2-pc installed.

* Thu Feb 12 2026 Linux Engineering <le-team@ciq.com> - 2.06-114
- Porting Rocky 9 secureboot grub2 to CIQ build and sign

Expand Down