[arch-commits] Commit in vhba-module/trunk (2 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Mon Jun 9 12:14:50 UTC 2014
Date: Monday, June 9, 2014 @ 14:14:50
Author: foutrelis
Revision: 112896
upgpkg: vhba-module 20130607-28
Linux 3.15 rebuild.
Added:
vhba-module/trunk/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
Modified:
vhba-module/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch | 54 ++++++++++
PKGBUILD | 22 ++--
2 files changed, 70 insertions(+), 6 deletions(-)
Added: 0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
===================================================================
--- 0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch (rev 0)
+++ 0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch 2014-06-09 12:14:50 UTC (rev 112896)
@@ -0,0 +1,54 @@
+From 6545ad1e266f4eb2428e93ba0fdb43d8b87d5fcd Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <rok.mandeljc at gmail.com>
+Date: Sat, 19 Apr 2014 12:06:23 +0200
+Subject: [PATCH] VHBA module: define scmd_dbg() and scmd_warn() macros only if
+ they are not defined already; fix for compilation on kernel 3.15 and newer
+ (bug #76)
+
+---
+ vhba-module/vhba.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
+index ae9b554..eb1c5e6 100644
+--- a/vhba-module/vhba.c
++++ b/vhba-module/vhba.c
+@@ -54,12 +54,16 @@ MODULE_LICENSE("GPL");
+ #define DPRINTK(fmt, args...)
+ #endif
+
++/* scmd_dbg was introduced in 3.15 */
++#ifndef scmd_dbg
+ #define scmd_dbg(scmd, fmt, a...) \
+ dev_dbg(&(scmd)->device->sdev_gendev, fmt, ##a)
++#endif
+
++#ifndef scmd_warn
+ #define scmd_warn(scmd, fmt, a...) \
+ dev_warn(&(scmd)->device->sdev_gendev, fmt, ##a)
+-
++#endif
+
+ #define VHBA_MAX_SECTORS_PER_IO 256
+ #define VHBA_MAX_ID 32
+@@ -276,7 +280,7 @@ static void vhba_scan_devices (struct work_struct *work)
+ }
+ change = vhost->chgtype[id];
+ exists = vhost->devices[id] != NULL;
+-
++
+ vhost->chgtype[id] = 0;
+ clear_bit(id, vhost->chgmap);
+
+@@ -289,7 +293,7 @@ static void vhba_scan_devices (struct work_struct *work)
+ dev_dbg(&vhost->shost->shost_gendev, "trying to add target 0:%d:0\n", id);
+ vhba_scan_devices_add(vhost, id);
+ } else {
+- /* quick sequence of add/remove or remove/add; we determine
++ /* quick sequence of add/remove or remove/add; we determine
+ which one it was by checking if device structure exists */
+ if (exists) {
+ /* remove followed by add: remove and (re)add */
+--
+2.0.0
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-09 12:14:47 UTC (rev 112895)
+++ PKGBUILD 2014-06-09 12:14:50 UTC (rev 112896)
@@ -5,21 +5,31 @@
pkgname=vhba-module
pkgver=20130607
-_extramodules=extramodules-3.14-ARCH
-pkgrel=27
+_extramodules=extramodules-3.15-ARCH
+pkgrel=28
pkgdesc="Kernel module that emulates SCSI devices"
arch=('i686' 'x86_64')
url="http://cdemu.sourceforge.net/"
license=('GPL')
-depends=('linux>=3.14' 'linux<3.15')
-makedepends=('linux-headers>=3.14' 'linux-headers<3.15')
+depends=('linux>=3.15' 'linux<3.16')
+makedepends=('linux-headers>=3.15' 'linux-headers<3.16')
options=(!makeflags)
install=$pkgname.install
source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
- '60-vhba.rules')
+ '60-vhba.rules'
+ '0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch')
md5sums=('660df41d08b1fd86baad1f16a0264438'
- '4dc37dc348b5a2c83585829bde790dcc')
+ '4dc37dc348b5a2c83585829bde790dcc'
+ '8c929ef662de89f348d277983cbb3952')
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix build with Linux 3.15
+ # http://sourceforge.net/p/cdemu/bugs/76/
+ patch -Np2 -i ../0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
+}
+
build() {
cd $pkgname-$pkgver
_kernver="$(cat /usr/lib/modules/$_extramodules/version)"
More information about the arch-commits
mailing list