From 5355c80b460187aa06b4e0545da06e7c91467ddd Mon Sep 17 00:00:00 2001 From: "Joseph S. Tate" Date: Wed, 20 May 2026 17:07:45 -0400 Subject: [PATCH] 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 --- ciq/SPECS/kernel-clk6.12.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ciq/SPECS/kernel-clk6.12.spec b/ciq/SPECS/kernel-clk6.12.spec index ba3d9a0f46dcd..9ac087fc37efd 100644 --- a/ciq/SPECS/kernel-clk6.12.spec +++ b/ciq/SPECS/kernel-clk6.12.spec @@ -662,6 +662,7 @@ ExclusiveOS: Linux Requires: %{name}-core-uname-r = %{KVERREL} Requires: %{name}-modules-uname-r = %{KVERREL} Requires: %{name}-modules-core-uname-r = %{KVERREL} +Requires: ciq-kmod Provides: installonlypkg(kernel) Provides: kernel = %{specversion}-%{pkg_release} %endif @@ -2875,6 +2876,12 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/usr/src/kernels mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir + # Ship %clk_version macro with kernel-devel for use by kmod specs + if [ -z "$Variant" ]; then + 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} + fi + # This is going to create a broken link during the build, but we don't use # it after this point. We need the link to actually point to something # when kernel-devel is installed, and a relative link doesn't work across @@ -4096,6 +4103,7 @@ fi\ %{expand:%%files %{?3:%{3}-}devel}\ %defverify(not mtime)\ /usr/src/kernels/%{KVERREL}%{?3:+%{3}}\ +%{!?3:/usr/lib/rpm/macros.d/macros.kernel-%{pkg_suffix}}\ %{expand:%%files %{?3:%{3}-}devel-matched}\ %{expand:%%files -f kernel-%{?3:%{3}-}modules-extra.list %{?3:%{3}-}modules-extra}\ %{expand:%%files -f kernel-%{?3:%{3}-}modules-internal.list %{?3:%{3}-}modules-internal}\