Skip to content

[CLK 6.18] spec: only require ciq-kmod on el9 - #1682

Merged
PlaidCat merged 1 commit into
ciq-6.18.yfrom
jtate/clk-kmod-requires-el9-only
Oct 9, 2026
Merged

PlaidCat merged 1 commit into
ciq-6.18.yfrom
jtate/clk-kmod-requires-el9-only

Conversation

@josephtate

Copy link
Copy Markdown

Summary

  • kernel-clk6.18 has an unconditional Requires: ciq-kmod (added in kernel-clk6.18: add ciq-kmod Requires and ship %clk_version macro #1294). ciq-kmod is a synthetic provide added by CIQ's patched el9 kmod (the weak-modules fix for xz-compressed symvers).
  • EL10's stock kmod (31-x) already handles xz and zstd symvers in weak-modules, and nothing on el10 provides ciq-kmod. With [CLK 6.18] spec: Enable Rocky 10 builds #1533 enabling Rocky 10 builds, the unconditional Requires would make kernel-clk6.18 uninstallable on EL10.
  • Guard the Requires with %if 0%{?rhel} == 9. It is el9-specific, so it should not block other EL versions either (e.g. if CLK ships for 8 later).
  • %changelog is intentionally untouched; it is regenerated from commit subjects at the next spec bump.

Test plan

  • rpmspec -P with --define "rhel N": Requires: ciq-kmod is present for rhel=9 and absent for rhel=8, rhel=10, and with rhel undefined.
  • rpmspec -P for rhel=10 parses cleanly.
  • Trial el10 mock build of kernel-clk6.18 and an install test (not done yet).

🤖 Generated with Claude Code

ciq-kmod is a synthetic provide added by the patched el9 kmod (weak-modules
fix for xz-compressed symvers). EL10's stock kmod already handles xz and zstd
symvers and nothing there provides ciq-kmod, so the unconditional Requires
makes kernel-clk6.18 uninstallable on EL10. Guard it to rhel == 9 so other
EL versions do not depend on the el9-only patched kmod.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

@PlaidCat PlaidCat left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

:shipit:

@PlaidCat
PlaidCat requested a review from a team October 8, 2026 21:31

@bmastbergen bmastbergen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

🥌

@PlaidCat
PlaidCat merged commit 6d753a4 into ciq-6.18.y Oct 9, 2026
11 checks passed
@PlaidCat
PlaidCat deleted the jtate/clk-kmod-requires-el9-only branch October 9, 2026 15:53
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