From ec5d8184c88d6ddc50b9e406c724a366518f0d9e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 1 Mar 2022 05:06:05 -0500
Subject: [PATCH] import ddiskit-3.6-15.20191129gitde1f684.el9

---
 SOURCES/0001-kabi-stablelists.patch | 42 +++++++++++++++++++++++++++++
 SPECS/ddiskit.spec                  |  9 ++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0001-kabi-stablelists.patch

diff --git a/SOURCES/0001-kabi-stablelists.patch b/SOURCES/0001-kabi-stablelists.patch
new file mode 100644
index 0000000..c152b03
--- /dev/null
+++ b/SOURCES/0001-kabi-stablelists.patch
@@ -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
diff --git a/SPECS/ddiskit.spec b/SPECS/ddiskit.spec
index 6982c00..f66cce4 100644
--- a/SPECS/ddiskit.spec
+++ b/SPECS/ddiskit.spec
@@ -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