Compare commits

...

No commits in common. "c9-beta" and "a9-test" have entirely different histories.

2 changed files with 2 additions and 21 deletions

View File

@ -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<rpm_dist>\.el([6-9]|[1-9][0-9])(_(0|[1-9][0-9]*))?)
+kernel_flex_version_re = {kernel_nvr_re}(?P<rpm_release_aux>(\.[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}

View File

@ -9,9 +9,9 @@
Name: ddiskit
Version: 3.6
%forgemeta
%forgemeta -i
Release: 16%{?dist}
Release: 15%{?dist}
Summary: Tool for Red Hat Enterprise Linux Driver Update Disk creation
License: GPLv3
@ -19,7 +19,6 @@ URL: %{forgeurl}
Source0: %{forgesource}
Patch0001: 0001-kabi-stablelists.patch
Patch0002: 0002-kernel-version-re-fix.patch
BuildArch: noarch
BuildRequires: python3-devel
@ -40,7 +39,6 @@ kernel modules.
%forgesetup
%patch0001 -p1
%patch0002 -p1
%build
%py3_build
@ -74,9 +72,6 @@ find %{buildroot} -size 0 -delete
%config(noreplace) /etc/ddiskit.config
%changelog
* Mon Jul 11 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-16
- Update kernel version RE for RHEL 9 idiosyncrasies (#2101634).
* Mon Feb 14 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-15
- Support kernel-abi-stablelists package usage in RHEL 9 (#1990207).