Skip to content

Commit 5355c80

Browse files
josephtateclaude
andcommitted
kernel-clk6.12: add ciq-kmod Requires and ship %clk_version macro
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>
1 parent a444d36 commit 5355c80

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

ciq/SPECS/kernel-clk6.12.spec

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,7 @@ ExclusiveOS: Linux
662662
Requires: %{name}-core-uname-r = %{KVERREL}
663663
Requires: %{name}-modules-uname-r = %{KVERREL}
664664
Requires: %{name}-modules-core-uname-r = %{KVERREL}
665+
Requires: ciq-kmod
665666
Provides: installonlypkg(kernel)
666667
Provides: kernel = %{specversion}-%{pkg_release}
667668
%endif
@@ -2875,6 +2876,12 @@ BuildKernel() {
28752876
mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
28762877
mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
28772878

2879+
# Ship %clk_version macro with kernel-devel for use by kmod specs
2880+
if [ -z "$Variant" ]; then
2881+
install -D -m 0644 /dev/null $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.kernel-%{pkg_suffix}
2882+
printf '%%clk_version %{kernel_major_minor}\n' > $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.kernel-%{pkg_suffix}
2883+
fi
2884+
28782885
# This is going to create a broken link during the build, but we don't use
28792886
# it after this point. We need the link to actually point to something
28802887
# when kernel-devel is installed, and a relative link doesn't work across
@@ -4096,6 +4103,7 @@ fi\
40964103
%{expand:%%files %{?3:%{3}-}devel}\
40974104
%defverify(not mtime)\
40984105
/usr/src/kernels/%{KVERREL}%{?3:+%{3}}\
4106+
%{!?3:/usr/lib/rpm/macros.d/macros.kernel-%{pkg_suffix}}\
40994107
%{expand:%%files %{?3:%{3}-}devel-matched}\
41004108
%{expand:%%files -f kernel-%{?3:%{3}-}modules-extra.list %{?3:%{3}-}modules-extra}\
41014109
%{expand:%%files -f kernel-%{?3:%{3}-}modules-internal.list %{?3:%{3}-}modules-internal}\

0 commit comments

Comments
 (0)