kernel-clk6.12: add ciq-kmod Requires and ship %clk_version macro#1253
Open
josephtate wants to merge 1 commit into
Open
kernel-clk6.12: add ciq-kmod Requires and ship %clk_version macro#1253josephtate wants to merge 1 commit into
josephtate wants to merge 1 commit into
Conversation
Require ciq-kmod from the kernel metapackage so the patched kmod binary (which handles xz-compressed symvers in CLK 6.x kernels) is pulled in automatically when the CLK kernel is installed. Ship /usr/lib/rpm/macros.d/macros.kernel-clk6.12 in kernel-clk6.12-devel so kmod spec files can use %clk_version to name CLK subpackages without hardcoding the kernel version string. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
PlaidCat
requested review from
a team,
bmastbergen and
Copilot
and removed request for
bmastbergen
There was a problem hiding this comment.
Pull request overview
This PR updates the kernel-clk6.12 RPM spec to ensure the CLK kernel pulls in the patched ciq-kmod package automatically, and to ship a %clk_version RPM macro via the kernel-clk6.12-devel package for downstream kmod specs to reference.
Changes:
- Add
Requires: ciq-kmodto thekernel-clk6.12metapackage. - Install a macros drop-in file that defines
%clk_version %{kernel_major_minor}during the base (non-variant)kernel-develbuild. - Add the macros file to the
%files ... devellist only for the base (non-variant) devel package.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+2881
to
+2882
| install -D -m 0644 /dev/null $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.kernel-%{pkg_suffix} | ||
| printf '%%clk_version %{kernel_major_minor}\n' > $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.kernel-%{pkg_suffix} |
| %{expand:%%files %{?3:%{3}-}devel}\ | ||
| %defverify(not mtime)\ | ||
| /usr/src/kernels/%{KVERREL}%{?3:+%{3}}\ | ||
| %{!?3:/usr/lib/rpm/macros.d/macros.kernel-%{pkg_suffix}}\ |
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.
Summary
Requires: ciq-kmodto thekernel-clk6.12metapackage so the patched kmod binary (which handles xz-compressed symvers in CLK 6.x kernels) is pulled in automatically when the CLK kernel is installed/usr/lib/rpm/macros.d/macros.kernel-clk6.12inkernel-clk6.12-develcontaining%clk_version 6.12, so kmod spec files can reference the CLK version without hardcoding it%filesentry are both guarded to the base (non-variant) devel package onlyTest plan
kernel-clk6.12andkernel-clk6.12-develRPMsrpm -qR kernel-clk6.12-*.rpmincludesciq-kmodrpm -ql kernel-clk6.12-devel-*.rpmincludes/usr/lib/rpm/macros.d/macros.kernel-clk6.12%clk_version 6.12🤖 Generated with Claude Code