From 5d4b391686093685a3e3ac67dfeff0b0ce947965 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 27 Nov 2024 07:37:55 +0000 Subject: [PATCH] import RHEL 10 Beta ddiskit-3.6-25.20191129gitde1f684.el10 --- .ddiskit.metadata | 1 - .gitignore | 2 +- SOURCES/0001-kabi-stablelists.patch | 42 ---------------- SOURCES/0002-kernel-version-re-fix.patch | 14 ------ SPECS/ddiskit.spec => ddiskit.spec | 63 ++++++++++++++++-------- sources | 1 + 6 files changed, 45 insertions(+), 78 deletions(-) delete mode 100644 .ddiskit.metadata delete mode 100644 SOURCES/0001-kabi-stablelists.patch delete mode 100644 SOURCES/0002-kernel-version-re-fix.patch rename SPECS/ddiskit.spec => ddiskit.spec (68%) create mode 100644 sources diff --git a/.ddiskit.metadata b/.ddiskit.metadata deleted file mode 100644 index 902ddf8..0000000 --- a/.ddiskit.metadata +++ /dev/null @@ -1 +0,0 @@ -dd79ea8e15423eac54793ed027343a05fff932ff SOURCES/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz diff --git a/.gitignore b/.gitignore index 7b9adef..111b55e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz +ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz diff --git a/SOURCES/0001-kabi-stablelists.patch b/SOURCES/0001-kabi-stablelists.patch deleted file mode 100644 index c152b03..0000000 --- a/SOURCES/0001-kabi-stablelists.patch +++ /dev/null @@ -1,42 +0,0 @@ -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/SOURCES/0002-kernel-version-re-fix.patch b/SOURCES/0002-kernel-version-re-fix.patch deleted file mode 100644 index 20425be..0000000 --- a/SOURCES/0002-kernel-version-re-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config -=================================================================== ---- ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.orig/ddiskit.config 2022-07-12 02:04:24.700230196 +0200 -+++ ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config 2022-07-12 02:07:27.444095264 +0200 -@@ -4,6 +4,9 @@ - major = 7 - minor = 0 - -+kernel_dist_re = (?P\.el([6-9]|[1-9][0-9])(_(0|[1-9][0-9]*))?) -+kernel_flex_version_re = {kernel_nvr_re}(?P(\.[0-9]{1,3})*){kernel_dist_re} -+ - [rpm_gpg_check] - ## Some initial assumption about the keyring dir - keyring_dir = {defaults.res_dir}/keyrings/{defaults.profile} diff --git a/SPECS/ddiskit.spec b/ddiskit.spec similarity index 68% rename from SPECS/ddiskit.spec rename to ddiskit.spec index 69484cd..5c9256e 100644 --- a/SPECS/ddiskit.spec +++ b/ddiskit.spec @@ -11,16 +11,13 @@ Version: 3.6 %forgemeta -Release: 16%{?dist} +Release: 25%{?dist} Summary: Tool for Red Hat Enterprise Linux Driver Update Disk creation -License: GPLv3 +License: GPL-3.0-only URL: %{forgeurl} Source0: %{forgesource} -Patch0001: 0001-kabi-stablelists.patch -Patch0002: 0002-kernel-version-re-fix.patch - BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -38,9 +35,9 @@ kernel modules. %prep %forgesetup - -%patch0001 -p1 -%patch0002 -p1 +# Fix build with setuptools 62.1 +# https://github.com/orosp/ddiskit/issues/17 +sed -i "8i packages=[]," setup.py %build %py3_build @@ -55,7 +52,7 @@ find %{buildroot} -size 0 -delete %files -n %{name} %doc README %license COPYING -%{python3_sitelib}/* +%{python3_sitelib}/ddiskit-*.egg-info %{_bindir}/ddiskit %{_mandir}/man1/ddiskit.1* %{_datadir}/bash-completion/completions/ddiskit @@ -74,23 +71,49 @@ find %{buildroot} -size 0 -delete %config(noreplace) /etc/ddiskit.config %changelog -* Mon Jul 11 2022 Eugene Syromiatnikov - 3.6-16 -- Update kernel version RE for RHEL 9 idiosyncrasies (#2101634). +* Mon Jun 24 2024 Troy Dawson - 3.6-25 +- Bump release for June 2024 mass rebuild -* Mon Feb 14 2022 Eugene Syromiatnikov - 3.6-15 -- Support kernel-abi-stablelists package usage in RHEL 9 (#1990207). +* Wed Jan 24 2024 Fedora Release Engineering - 3.6-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Mon Aug 09 2021 Mohan Boddu - 3.6-14.gitde1f684.gitde1f684 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Fri Jan 19 2024 Fedora Release Engineering - 3.6-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Thu Apr 29 2021 Eugene Syromiatnikov - 3.6-13 +* Mon Dec 04 2023 Eugene Syromiatnikov - 3.6-22 +- Migrated to SPDX license + +* Wed Jul 19 2023 Fedora Release Engineering - 3.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 3.6-20 +- Rebuilt for Python 3.12 + +* Thu Jan 19 2023 Fedora Release Engineering - 3.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Lumír Balhar - 3.6-17 +- Fix build with new setuptools + +* Mon Jun 13 2022 Python Maint - 3.6-16 +- Rebuilt for Python 3.11 + +* Thu Jan 20 2022 Fedora Release Engineering - 3.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 3.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 3.6-13 +- Rebuilt for Python 3.10 + +* Thu Apr 29 2021 Eugene Syromiatnikov - 3.6-12 - Change "Requires: genisoimage" dependency to "Requires: /usr/bin/mkisofs" to enable xorriso-provided drop-in replacement implementation usage. -* Thu Apr 15 2021 Mohan Boddu - 3.6-12 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - * Tue Jan 26 2021 Fedora Release Engineering - 3.6-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..c6be0b1 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz) = 1b3d7dc10ab85c4b3a876cf6afb530baf0d5dd260cfdb51a3ef3b2906f3f163f86c40f3c2d05114cf3fb0bf79120d446aff8c4589e321ac9b9fafc015104a006