From 0ded474ae84af81cdfb866d05715e428c51e718a Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Thu, 18 Jun 2020 18:38:30 +0300 Subject: [PATCH] w/a illegal characters in RPM Provides --- ...PM-illegal-chars-from-module-version.patch | 40 +++++++++++++++++++ kernel.spec | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-Remove-RPM-illegal-chars-from-module-version.patch diff --git a/0001-Remove-RPM-illegal-chars-from-module-version.patch b/0001-Remove-RPM-illegal-chars-from-module-version.patch new file mode 100644 index 0000000..f968273 --- /dev/null +++ b/0001-Remove-RPM-illegal-chars-from-module-version.patch @@ -0,0 +1,40 @@ +From 6af124938e319e736cc09a621de907d4328b70e0 Mon Sep 17 00:00:00 2001 +From: Mikhail Novosyolov +Date: Thu, 18 Jun 2020 18:29:39 +0300 +Subject: [PATCH] Remove RPM-illegal chars from module version + +$ modinfo aacraid.ko | grep ^version: +version: 1.2.1[50877]-custom + +kmod-deps.sh from rpm-openmandriva-setup is an RPM generator of Provides, it generates: +"kmod(aacraid) = 1.2.1[50877]_custom" +'[' and ']' are illegal characters in RPM + +I have no idea how to deal with it in kmod-deps.sh and do not want to drop this/these provide(s), +so let me just patch the module version inside the kernel. + +Converting from '1.2.1[50877]-custom' to '1.2.1_50877-custom' +No idea if any external scripts rely on parsing this version, hope that no. + +Upstreamized: not needed +Signed-off-by: Mikhail Novosyolov +--- + drivers/scsi/aacraid/linit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c +index 4a858789e6c5..fbded922a52e 100644 +--- a/drivers/scsi/aacraid/linit.c ++++ b/drivers/scsi/aacraid/linit.c +@@ -53,7 +53,7 @@ + #ifdef AAC_DRIVER_BUILD + #define _str(x) #x + #define str(x) _str(x) +-#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION "[" str(AAC_DRIVER_BUILD) "]" AAC_DRIVER_BRANCH ++#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION "_" str(AAC_DRIVER_BUILD) AAC_DRIVER_BRANCH + #else + #define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION AAC_DRIVER_BRANCH + #endif +-- +2.25.1 + diff --git a/kernel.spec b/kernel.spec index edd64b2..92e89aa 100644 --- a/kernel.spec +++ b/kernel.spec @@ -17,7 +17,7 @@ %define sublevel 40 # Release number. Increase this before a rebuild. -%define rpmrel 2 +%define rpmrel 3 %define fullrpmrel %{rpmrel} %define rpmtag %{disttag} @@ -233,6 +233,10 @@ Patch102: audit-make-it-less-verbose.patch # AUFS from http://aufs.sourceforge.net/ Patch109: fs-aufs.patch +# For kmod() generator of RPM Provides +# Changes version of aacraid.ko +Patch110: 0001-Remove-RPM-illegal-chars-from-module-version.patch + # AltHa LSM Module # https://www.altlinux.org/AltHa # http://git.altlinux.org/gears/k/kernel-image-un-def.git