Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / vhba-module
Commits:
14ac2059 by Jan Alexander Steffens (heftig) at 2025-03-25T01:59:51+01:00
20240917-37: Fix for linux 6.14
- - - - -
3 changed files:
- .SRCINFO
- + 0001-VHBA-fix-building-with-kernel-6.14-rc1.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = vhba-module
pkgdesc = Kernel module that emulates SCSI devices
pkgver = 20240917
- pkgrel = 36
+ pkgrel = 37
url = https://cdemu.sourceforge.io/
arch = x86_64
license = GPL-2.0-or-later
@@ -9,8 +9,10 @@ pkgbase = vhba-module
makedepends = linux-headers
source =
cdemu-code::git+https://git.code.sf.net/p/cdemu/code#tag=vhba-module-20240917
source = dkms.conf
+ source = 0001-VHBA-fix-building-with-kernel-6.14-rc1.patch
b2sums =
b5ba434ce50dfb747b8a84e81ddc72d3478215156d104d698179169d57c4fbfc673756304d104406ec57642cec7219a0f79e1765a076dcb56b4b8338ba5f585d
b2sums =
f1f3d97fc450de4a0257fa4c864eb7245f6c9657472eec67949b1335681ba86a40273b7fb11d023e406f792709252d80e635791674bdf79153f53161b4c5d871
+ b2sums =
f1555f60ee656a22694606e298d35d84bb2a3ccce878697501d6e0b763f28a4499a58e3e7dc08ed9bc0762a527d924e636540bab0b42221fbb105031a47d5c99
pkgname = vhba-module
depends = linux
=====================================
0001-VHBA-fix-building-with-kernel-6.14-rc1.patch
=====================================
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <[email protected]>
+Date: Mon, 3 Feb 2025 21:05:32 +0100
+Subject: [PATCH] VHBA: fix building with kernel 6.14-rc1
+
+Kernel 6.14-rc1 simplified the selection of tag allocation policy.
+Instead of enum-based value, a boolean is used, and the corresponding
+field in the `scsi_host_template` structure was renamed from
+`tag_alloc_policy` to `tag_alloc_policy_rr`.
+
+See: https://github.com/torvalds/linux/commit/ce32496
+---
+ vhba-module/vhba.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
+index 7531223355e5..64b09ece2e5a 100644
+--- a/vhba-module/vhba.c
++++ b/vhba-module/vhba.c
+@@ -537,7 +537,9 @@ static struct scsi_host_template vhba_template = {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+ .slave_alloc = vhba_slave_alloc,
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
++ .tag_alloc_policy_rr = true,
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
+ .tag_alloc_policy = BLK_TAG_ALLOC_RR,
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) && LINUX_VERSION_CODE <
KERNEL_VERSION(4, 4, 0)
=====================================
PKGBUILD
=====================================
@@ -9,7 +9,7 @@ pkgname=(
vhba-module-dkms
)
pkgver=20240917
-pkgrel=36
+pkgrel=37
pkgdesc="Kernel module that emulates SCSI devices"
url="https://cdemu.sourceforge.io/";
arch=(x86_64)
@@ -21,12 +21,15 @@ makedepends=(
source=(
"cdemu-code::git+https://git.code.sf.net/p/cdemu/code#tag=$pkgbase-$pkgver";
dkms.conf
+ 0001-VHBA-fix-building-with-kernel-6.14-rc1.patch
)
b2sums=('b5ba434ce50dfb747b8a84e81ddc72d3478215156d104d698179169d57c4fbfc673756304d104406ec57642cec7219a0f79e1765a076dcb56b4b8338ba5f585d'
-
'f1f3d97fc450de4a0257fa4c864eb7245f6c9657472eec67949b1335681ba86a40273b7fb11d023e406f792709252d80e635791674bdf79153f53161b4c5d871')
+
'f1f3d97fc450de4a0257fa4c864eb7245f6c9657472eec67949b1335681ba86a40273b7fb11d023e406f792709252d80e635791674bdf79153f53161b4c5d871'
+
'f1555f60ee656a22694606e298d35d84bb2a3ccce878697501d6e0b763f28a4499a58e3e7dc08ed9bc0762a527d924e636540bab0b42221fbb105031a47d5c99')
prepare() {
cd cdemu-code
+ git apply -3 ../0001-VHBA-fix-building-with-kernel-6.14-rc1.patch
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/vhba-module/-/commit/14ac2059cf8e4312836311b249d400da0e8e8a8a
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/vhba-module/-/commit/14ac2059cf8e4312836311b249d400da0e8e8a8a
You're receiving this email because of your account on gitlab.archlinux.org.
