Provide custom REs for the dist tag and kernel version

It was decided (citing dubious reasons) to arbitrarily change
the way GA kernel version is versioned, breaking existing assumptions.
Accomodate for that.

* 0002-kernel-version-re-fix.patch: New file.
* ddiskit.spec (Patch0002): New patch.
(%prep): Apply it.

Resolves: RHEL-61716
This commit is contained in:
Eugene Syromiatnikov 2022-07-12 03:54:06 +02:00
parent 84c09b81de
commit 0ea0c9a127
2 changed files with 18 additions and 0 deletions

View File

@ -0,0 +1,14 @@
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

@ -18,6 +18,8 @@ License: GPL-3.0-only
URL: %{forgeurl}
Source0: %{forgesource}
Patch0002: 0002-kernel-version-re-fix.patch
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-setuptools
@ -39,6 +41,8 @@ kernel modules.
# https://github.com/orosp/ddiskit/issues/17
sed -i "8i packages=[]," setup.py
%patch -P 0002 -p1
%build
%py3_build