Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / vhba-module
Commits:
2c1c4567 by Jan Alexander Steffens (heftig) at 2024-09-17T23:01:20+02:00
20240917-1
- - - - -
3 changed files:
- .SRCINFO
- − 0001-vhba-Fix-compat-with-kernel-6.11.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,17 +1,15 @@
pkgbase = vhba-module
pkgdesc = Kernel module that emulates SCSI devices
- pkgver = 20240202
- pkgrel = 50
+ pkgver = 20240917
+ pkgrel = 1
url = https://cdemu.sourceforge.io/
arch = x86_64
license = GPL-2.0-or-later
makedepends = git
makedepends = linux-headers
- source =
cdemu-code::git+https://git.code.sf.net/p/cdemu/code#tag=vhba-module-20240202
- source = 0001-vhba-Fix-compat-with-kernel-6.11.patch
+ source =
cdemu-code::git+https://git.code.sf.net/p/cdemu/code#tag=vhba-module-20240917
source = dkms.conf
- b2sums =
2c97148e88aac9281ffcaee579b0cd9f00117086e69f9035e44e4288f5ba28a6a3b1246c922647742dbed7666fd8158431d600387247132808097bdb33f74981
- b2sums =
6d9760141a6345ff77a8e032c46656a6d328e8c473e4e824d4f727ed7e01ab46bfcba8af28efc2c0ee243964a5c7faccb22884667331bbf769eb336581802c08
+ b2sums =
b5ba434ce50dfb747b8a84e81ddc72d3478215156d104d698179169d57c4fbfc673756304d104406ec57642cec7219a0f79e1765a076dcb56b4b8338ba5f585d
b2sums =
f1f3d97fc450de4a0257fa4c864eb7245f6c9657472eec67949b1335681ba86a40273b7fb11d023e406f792709252d80e635791674bdf79153f53161b4c5d871
pkgname = vhba-module
=====================================
0001-vhba-Fix-compat-with-kernel-6.11.patch deleted
=====================================
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
-Date: Sun, 15 Sep 2024 19:05:46 +0000
-Subject: [PATCH] vhba: Fix compat with kernel 6.11
-
-Upstream commit 0edb555a65d1ef047a9805051c36922b52a38a9d changed the
-return value of the `remove` callback from `int` to `void`.
----
- vhba-module/vhba.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
-index e2331d4dc788..7531223355e5 100644
---- a/vhba-module/vhba.c
-+++ b/vhba-module/vhba.c
-@@ -1049,20 +1049,26 @@ static int vhba_probe (struct platform_device *pdev)
- return 0;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
- static int vhba_remove (struct platform_device *pdev)
-+#else
-+static void vhba_remove (struct platform_device *pdev)
-+#endif
- {
- struct vhba_host *vhost;
- struct Scsi_Host *shost;
-
- vhost = platform_get_drvdata(pdev);
- shost = vhost->shost;
-
- scsi_remove_host(shost);
- scsi_host_put(shost);
-
- kfree(vhost->commands);
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
- return 0;
-+#endif
- }
-
- static void vhba_release (struct device * dev)
=====================================
PKGBUILD
=====================================
@@ -8,8 +8,8 @@ pkgname=(
vhba-module
vhba-module-dkms
)
-pkgver=20240202
-pkgrel=50
+pkgver=20240917
+pkgrel=1
pkgdesc="Kernel module that emulates SCSI devices"
url="https://cdemu.sourceforge.io/";
arch=(x86_64)
@@ -20,16 +20,13 @@ makedepends=(
)
source=(
"cdemu-code::git+https://git.code.sf.net/p/cdemu/code#tag=$pkgbase-$pkgver";
- 0001-vhba-Fix-compat-with-kernel-6.11.patch
dkms.conf
)
-b2sums=('2c97148e88aac9281ffcaee579b0cd9f00117086e69f9035e44e4288f5ba28a6a3b1246c922647742dbed7666fd8158431d600387247132808097bdb33f74981'
-
'6d9760141a6345ff77a8e032c46656a6d328e8c473e4e824d4f727ed7e01ab46bfcba8af28efc2c0ee243964a5c7faccb22884667331bbf769eb336581802c08'
+b2sums=('b5ba434ce50dfb747b8a84e81ddc72d3478215156d104d698179169d57c4fbfc673756304d104406ec57642cec7219a0f79e1765a076dcb56b4b8338ba5f585d'
'f1f3d97fc450de4a0257fa4c864eb7245f6c9657472eec67949b1335681ba86a40273b7fb11d023e406f792709252d80e635791674bdf79153f53161b4c5d871')
prepare() {
cd cdemu-code
- git apply -3 "$srcdir"/0001-vhba-Fix-compat-with-kernel-6.11.patch
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/vhba-module/-/commit/2c1c45677a48a6a03f52accfcc9b2302faf14f42
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/vhba-module/-/commit/2c1c45677a48a6a03f52accfcc9b2302faf14f42
You're receiving this email because of your account on gitlab.archlinux.org.
