diff --git a/SPECS/kmod-aacraid.spec b/SPECS/kmod-aacraid.spec
index 7ed7f3c..d1b2f46 100644
--- a/SPECS/kmod-aacraid.spec
+++ b/SPECS/kmod-aacraid.spec
@@ -2,11 +2,11 @@
%global driver_version 4.18.0-305.el8
-%global kernel_version 4.18.0-305.19.1.el8_4
+%global kernel_version 4.18.0-305.3.1.el8_4
%global _use_internal_dependency_generator 0
-%global __find_requires %{nil}
-%global __find_provides /usr/lib/rpm/find-provides
+%global __find_requires /usr/lib/rpm/redhat/find-requires
+%global __find_provides /usr/lib/rpm/redhat/find-provides
%global debug_package %{nil}
@@ -20,8 +20,8 @@
Name: kmod-%{pkg}
-Version: 4.18.0
-Release: 305.19.1%{?dist}
+Version: 4.18.0.305
+Release: 1%{?dist}
Summary: Dell PERC2, 2/Si, 3/Si, 3/Di, Adaptec Advanced Raid Products, HP NetRAID-4M, IBM ServeRAID & ICP SCSI (%{pkg}) driver
License: GPLv2
@@ -34,28 +34,29 @@ ExclusiveArch: x86_64
BuildRequires: elfutils-libelf-devel
BuildRequires: gcc
+BuildRequires: kernel-rpm-macros
BuildRequires: kmod
BuildRequires: make
BuildRequires: redhat-rpm-config
BuildRequires: xz
+BuildRequires: kernel-abi-stablelists = %{kernel_version}
BuildRequires: kernel-devel = %{kernel_version}
BuildRequires: kernel-devel-uname-r = %{kernel_version}.%{_arch}
-Requires: kernel-core = %{kernel_version}
-Requires: kernel-core-uname-r = %{kernel_version}.%{_arch}
-Requires: kernel-modules = %{kernel_version}
-Requires: kernel-modules-uname-r = %{kernel_version}.%{_arch}
+Requires: kernel >= %{kernel_version}
+Requires: kernel-uname-r >= %{kernel_version}.%{_arch}
+Requires: kernel-modules >= %{kernel_version}
+Requires: kernel-modules-uname-r >= %{kernel_version}.%{_arch}
Provides: installonlypkg(kernel-module)
-Provides: kernel-modules = %{kernel_version}.%{_arch}
-Provides: %{name}-%{kernel_version}.%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: kernel-modules >= %{kernel_version}.%{_arch}
-Requires(post): /usr/sbin/depmod
-Requires(postun): /usr/sbin/depmod
+Requires(post): %{_sbindir}/depmod
+Requires(postun): %{_sbindir}/depmod
-Requires(post): /usr/bin/dracut
-Requires(postun): /usr/bin/dracut
+Requires(post): %{_sbindir}/weak-modules
+Requires(postun): %{_sbindir}/weak-modules
%description
@@ -146,6 +147,13 @@ popd
# Make .ko objects temporarily executable for automatic stripping
find %{buildroot}/lib/modules -type f -name \*.ko -exec chmod u+x \{\} \+
+# Generate depmod.conf
+%{__install} -d %{buildroot}/%{_sysconfdir}/depmod.d/
+for kmod in $(find %{buildroot}/lib/modules/%{kernel_version}.%{_arch}/extra -type f -name \*.ko -printf "%%P\n" | sort)
+do
+ echo "override $(basename $kmod .ko) * weak-updates/$(dirname $kmod)" >> %{buildroot}/%{_sysconfdir}/depmod.d/%{pkg}.conf
+done
+
%clean
%{__rm} -rf %{buildroot}
@@ -153,63 +161,36 @@ find %{buildroot}/lib/modules -type f -name \*.ko -exec chmod u+x \{\} \+
%post
mkdir -p %{_localstatedir}/lib/rpm-state/sig-kmods
-touch %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch}
+printf '%s\n' "/lib/modules/%{kernel_version}.%{_arch}/extra/drivers/scsi/%{pkg}/%{pkg}.ko.xz" >> %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-add
%preun
mkdir -p %{_localstatedir}/lib/rpm-state/sig-kmods
-touch %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch}
+rpm -ql kmod-%{pkg}-%{?epoch:%{epoch}:}%{version}-%{release}.%{_arch} | grep '/lib/modules/%{kernel_version}.%{_arch}/.*\.ko\.xz$' >> %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-remove
%postun
-if [ -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} ]
+if [ -f %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-remove ]
then
- if [ -f /lib/modules/%{kernel_version}.%{_arch}/System.map ]
- then
- /usr/sbin/depmod -aeF /lib/modules/%{kernel_version}.%{_arch}/System.map %{kernel_version}.%{_arch}
- fi
-
- if [ -f /boot/initramfs-%{kernel_version}.%{_arch}.img ]
- then
- if /usr/bin/dracut -f --rebuild /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew %{kernel_version}.%{_arch}
- then
- if ! cmp -s /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew
- then
- mv /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew /boot/initramfs-%{kernel_version}.%{_arch}.img
- else
- rm -f /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew
- fi
- fi
- fi
-
- rm -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch}
+ modules=( $(cat %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-remove) )
+ rm -f %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-remove
rmdir --ignore-fail-on-non-empty %{_localstatedir}/lib/rpm-state/sig-kmods
+ printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --remove-modules
fi
+%pretrans -p <lua>
+posix.unlink("%{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-add")
+posix.unlink("%{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-remove")
+
+
%posttrans
-if [ -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch} ]
+if [ -f %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-add ]
then
- if [ -f /lib/modules/%{kernel_version}.%{_arch}/System.map ]
- then
- /usr/sbin/depmod -aeF /lib/modules/%{kernel_version}.%{_arch}/System.map %{kernel_version}.%{_arch}
- fi
-
- if [ -f /boot/initramfs-%{kernel_version}.%{_arch}.img ]
- then
- if /usr/bin/dracut -f --rebuild /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew %{kernel_version}.%{_arch}
- then
- if ! cmp -s /boot/initramfs-%{kernel_version}.%{_arch}.img /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew
- then
- mv /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew /boot/initramfs-%{kernel_version}.%{_arch}.img
- else
- rm -f /boot/initramfs-%{kernel_version}.%{_arch}.img.rpmnew
- fi
- fi
- fi
-
- rm -f %{_localstatedir}/lib/rpm-state/sig-kmods/%{kernel_version}.%{_arch}
+ modules=( $(cat %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-add) )
+ rm -f %{_localstatedir}/lib/rpm-state/sig-kmods/weak-modules-add
rmdir --ignore-fail-on-non-empty %{_localstatedir}/lib/rpm-state/sig-kmods
+ printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --add-modules
fi
@@ -217,9 +198,16 @@ fi
%defattr(644,root,root,755)
/lib/modules/%{kernel_version}.%{_arch}
%license COPYING
+%config(noreplace) %{_sysconfdir}/depmod.d/%{pkg}.conf
%changelog
+* Thu Oct 28 2021 Peter Georg <peter.georg@physik.uni-regensburg.de> - 4.18.0.305-1
+- Convert to kABI tracking kmod package (kernel >= 4.18.0-305.3.1.el8)
+- Build 4.18.0-305.el8 for 4.18.0-305.3.1.el8_4
+- Use release number independent of kernel
+- Add driver release number to version
+
* Wed Sep 15 2021 Peter Georg <peter.georg@physik.uni-regensburg.de> - 4.18.0-305.19.1
- Rebuild for 4.18.0-305.19.1.el8_4