From 45c81075041dd522a671ff897c97bdebc96506f7 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Sep 28 2021 14:58:36 +0000 Subject: Convert to kABI-tracking kmod package --- diff --git a/SPECS/kmod-xt_time.spec b/SPECS/kmod-xt_time.spec index 999a377..71a0b98 100644 --- a/SPECS/kmod-xt_time.spec +++ b/SPECS/kmod-xt_time.spec @@ -1,10 +1,10 @@ %global pkg xt_time -%global kernel_version 4.18.0-338.el8 +%global kernel_version 4.18.0-315.el8 %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} @@ -19,7 +19,7 @@ Name: kmod-%{pkg} Version: 5.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Time match support for Netfilter (xt_time) License: GPLv2 @@ -31,28 +31,29 @@ ExclusiveArch: x86_64 aarch64 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 @@ -84,63 +85,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/net/netfilter/%{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 +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 @@ -151,6 +125,9 @@ fi %changelog +* Tue Sep 28 2021 Peter Georg - 5.9-5 +- Convert to kABI tracking kmod package (kernel >= 4.18.0-315.el8) + * Mon Aug 30 2021 Peter Georg - 5.9-4 - Set specific kernel version to use - Add Provides kernel-modules