mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
|
From 6af124938e319e736cc09a621de907d4328b70e0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
||
|
|
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 <m.novosyolov@rosalinux.ru>
|
||
|
|
---
|
||
|
|
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
|
||
|
|
|