rpms
/
ddiskit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Support kernel-abi-stablelists package usage in RHEL 9 

Resolves: #1990207
Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
This commit is contained in:
Eugene Syromiatnikov 2022-02-15 01:10:11 +01:00
parent fbd0db07f8
commit de78babca0
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-kabi-stablelists.patch Normal file
View File

@ -0,0 +1,42 @@
Index: ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/templates/spec
===================================================================
--- ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.orig/templates/spec 2019-07-11 06:00:36.000000000 +0200
+++ ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/templates/spec 2022-02-15 01:18:40.875578229 +0100
@@ -21,12 +21,19 @@
%endif
%if "%{kmod_dist_build_deps}" == ""
+%if (0%{?rhel} > 8) || (0%{?centos} > 8)
+%define abi_list stablelist
+%define kmod_dist_build_deps redhat-rpm-config kernel-abi-stablelists elfutils-libelf-devel kernel-rpm-macros kmod
+%else
%if (0%{?rhel} > 7) || (0%{?centos} > 7)
+%define abi_list whitelist
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists elfutils-libelf-devel kernel-rpm-macros kmod
%else
+%define abi_list whitelist
%define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists
%endif
%endif
+%endif
Source0: %{kmod_name}-%{kmod_vendor}-%{kmod_driver_version}.tar.bz2
%{SOURCE_PATCHES}
@@ -210,7 +217,7 @@
# mark modules executable so that strip-to-file can strip them
find obj/%{kmod_kbuild_dir} -name "*.ko" -type f -exec chmod u+x '{}' +
-whitelist="/lib/modules/kabi-current/kabi_whitelist_%{_target_cpu}"
+kabilist="/lib/modules/kabi-current/kabi_%{abi_list}_%{_target_cpu}"
for modules in $( find obj/%{kmod_kbuild_dir} -name "*.ko" -type f -printf "%{findpat}\n" | sed 's|\.ko$||' | sort -u ) ; do
# update depmod.conf
module_weak_path=$(echo "$modules" | sed 's/[\/]*[^\/]*$//')
@@ -227,7 +234,7 @@
# update greylist
nm -u obj/%{kmod_kbuild_dir}/$modules.ko | sed 's/.*U //' | sed 's/^\.//' | sort -u | while read -r symbol; do
- grep -q "^\s*$symbol\$" $whitelist || echo "$symbol" >> source/greylist
+ grep -q "^\s*$symbol\$" $kabilist || echo "$symbol" >> source/greylist
done
done
sort -u source/greylist | uniq > source/greylist.txt

9
ddiskit.spec
View File

@ -11,13 +11,15 @@ Version: 3.6
%forgemeta
Release: 14%{?dist}
Release: 15%{?dist}
Summary: Tool for Red Hat Enterprise Linux Driver Update Disk creation
License: GPLv3
URL: %{forgeurl}
Source0: %{forgesource}
Patch0001: 0001-kabi-stablelists.patch
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-setuptools
@ -36,6 +38,8 @@ kernel modules.
%prep
%forgesetup
%patch0001 -p1
%build
%py3_build
@ -68,6 +72,9 @@ find %{buildroot} -size 0 -delete
%config(noreplace) /etc/ddiskit.config
%changelog
* Mon Feb 14 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-15
- Support kernel-abi-stablelists package usage in RHEL 9 (#1990207).
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.6-14.gitde1f684.gitde1f684
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688