Skip to content

el8 grub2: Release 167.1.5%{?dist} (grub2-pc-modules fix never actually shipped) - #10

Merged
jason-rodri merged 2 commits into
ciq8from
grub2-ciq8-el8-0.1.5
Jul 31, 2026
Merged

el8 grub2: Release 167.1.5%{?dist} (grub2-pc-modules fix never actually shipped)#10
jason-rodri merged 2 commits into
ciq8from
grub2-ciq8-el8-0.1.5

Conversation

@jason-rodri

@jason-rodri jason-rodri commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Summary

Replaces #9, which conflicts with ciq8 because add-ciq-grub2-provides-ciq8
was already merged once before (PR #5) and its older commits now exist on
ciq8 under different SHAs from a squash/rebase-merge — same class of
conflict already hit and solved once for ciq9 (#7#8).

This branch is fresh off ciq8's current tip with only the genuinely new
commits on top.

The underlying fix: .0.1.4's changelog entry claims the
with_legacy_modules fix (grub2-pc-modules built on x86_64), but that fix
was edited into the spec after .0.1.4 was already published, under the
same release number. Both the real published packages and our own reference
build are missing grub2-pc-modules at .0.1.4 despite the spec being
correct. Republishing under the same NVR isn't safe, so this bumps the
release.

Release format (per releng review): %{?dist} moved to the end of
Release (standard convention — most tooling assumes dist is the last
component), and the redundant .ciq marker dropped. Final NVR:
grub2-2.02-167.1.5.el8, Epoch 5.

Test plan

  • rpmspec -q --target x86_64 confirms grub2-pc-modules,
    grub2-efi-x64-modules, grub2-efi-ia32-modules are declared
  • rpm -qp on the rebuilt SRPM confirms NVR grub2-2.02-167.1.5.el8, Epoch 5
  • HSM-sign via sb_build.sh <variant> el8-grub2 and confirm grub2-pc-modules
    actually appears in the signed output (x86_64 only — aarch64 never builds
    grub2-pc)
  • Real dnf update test on an EL8.6/RLC8/SCN8 box with stock grub2-pc
    installed, confirming it no longer errors on protected-package removal

🤖 Generated with Claude Code

.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>
Copilot AI review requested due to automatic review settings July 31, 2026 19:53
@jason-rodri
jason-rodri requested a review from ajorgens-ciq July 31, 2026 19:54
@jason-rodri jason-rodri self-assigned this Jul 31, 2026

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR performs an EL8 CIQ grub2 release bump to ensure the previously intended with_legacy_modules / grub2-pc-modules fix is actually shipped under a new, safe NVR (avoiding republishing the already-published .0.1.4).

Changes:

  • Bump Release from 167%{?dist}.ciq.0.1.4 to 167%{?dist}.ciq.0.1.5.
  • Add a new %changelog entry documenting that this is a rebuild/release bump only.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@juphoff
juphoff self-requested a review July 31, 2026 20:05
juphoff
juphoff previously approved these changes Jul 31, 2026
Per releng: %{?dist} belongs at the end of Release (standard convention,
most tooling assumes dist is the last component), and the .ciq marker is
redundant. Same NVR content/fix as the previous commit, just reformatted:
grub2-2.02-167.1.5.el8 instead of grub2-2.02-167.el8.ciq.0.1.5.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings July 31, 2026 20:24
@jason-rodri jason-rodri changed the title el8 grub2: Release bump to .ciq.0.1.5 (grub2-pc-modules fix never actually shipped) el8 grub2: Release 167.1.5%{?dist} (grub2-pc-modules fix never actually shipped) Jul 31, 2026
@jason-rodri
jason-rodri requested a review from juphoff July 31, 2026 20:25

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

@jason-rodri
jason-rodri merged commit 9b9c56e into ciq8 Jul 31, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants