From dd26e863aedebcaa72c8b4595441e28f841a2882 Mon Sep 17 00:00:00 2001
From: Greg Cymbalski <greg.cymbalski@versity.com>
Date: Fri, 24 Apr 2026 15:06:31 -0700
Subject: [PATCH] Optionally generate per-kver pinned kmod packages

Allow building the kmod pinned to an exact kver by defining
%{per_kver}=1 at build time:
- Package names use conventions used elsewhere in RHEL to indicate the
  kernel version built against
- A virtual package, kmod-scoutfs, preserves the existing name and also
  makes it simple to install with yum via repository
- Strict requirements on the kver built against in accordance with
  conventions
- Disabling automatic use of weak-modules

If not defining per_kver to 1, legacy behavior is preserved, meaning we
can deliver packages for the same scoutfs commit in both styles
depending on customer needs.

Signed-off-by: Greg Cymbalski <greg.cymbalski@versity.com>
---
 kmod/scoutfs-kmod.spec.in | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/kmod/scoutfs-kmod.spec.in b/kmod/scoutfs-kmod.spec.in
index 836159be..3df2f70f 100644
--- a/kmod/scoutfs-kmod.spec.in
+++ b/kmod/scoutfs-kmod.spec.in
@@ -4,9 +4,15 @@
 %define kmod_git_describe @@GITDESCRIBE@@
 %define pkg_date %(date +%%Y%%m%%d)
 
+# Package type: set --define 'per_kver 1' to tie the package to a specific kernel
+# version (per-kver mode); leave unset for the default per-minor-release behavior.
+
 # take kernel version or default to uname -r
 %{!?kversion: %global kversion %(uname -r)}
 %global kernel_version %{kversion}
+%if 0%{?per_kver}
+%define sanitized_kernel_version %(echo %{kernel_version} | tr - _ |sed -e 's/.x86_64//')
+%endif
 
 %if 0%{?el7}
 %global kernel_source() /usr/src/kernels/%{kernel_version}.$(arch)
@@ -17,16 +23,34 @@
 %{!?_release: %global _release 0.%{pkg_date}git%{kmod_git_hash}}
 
 %if 0%{?el7}
+%if 0%{?per_kver}
+Name:           %{kmod_name}-%{sanitized_kernel_version}
+Provides:       %{kmod_name} = %{kmod_version}
+%else
 Name:           %{kmod_name}
+%endif
+%else
+%if 0%{?per_kver}
+Name:           kmod-%{kmod_name}-%{sanitized_kernel_version}
+Provides:       kmod-%{kmod_name} = %{kmod_version}
 %else
 Name:           kmod-%{kmod_name}
 %endif
+%endif
 Summary:        %{kmod_name} kernel module
 Version:        %{kmod_version}
+%if 0%{?per_kver}
+Release:        %{_release}
+%else
 Release:        %{_release}%{?dist}
+%endif
 License:        GPLv2
 Group:          System/Kernel
 URL:            http://scoutfs.org/
+%if 0%{?per_kver}
+Requires:       kernel-core-uname-r = %{kernel_version}
+Requires:       kernel-modules-uname-r = %{kernel_version}
+%endif
 
 %if 0%{?el7}
 BuildRequires:  %{kernel_module_package_buildreqs}
@@ -105,7 +129,9 @@ find %{buildroot} -type f -name \*.ko -exec %{__chmod} u+x \{\} \;
 /lib/modules
 
 %post
+%if ! 0%{?per_kver}
 echo /lib/modules/%{kversion}/%{install_mod_dir}/scoutfs.ko | weak-modules --add-modules --no-initramfs
+%endif
 depmod -a
 %endif