rebuild packages against linux-libre-3.15.1-1

2 files changed, 71 insertions, 7 deletions

diff --git a/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch b/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
new file mode 100644
index 000000000..8f4603ebc
--- /dev/null
+++ b/libre/vhba-module-libre/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
@@ -0,0 +1,54 @@
+From 6545ad1e266f4eb2428e93ba0fdb43d8b87d5fcd Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <rok.mandeljc@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
+
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 952935c35..c32ba0309 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112896 2014-06-09 12:14:50Z foutrelis $
+# $Id: PKGBUILD 113281 2014-06-17 08:06:25Z tpowa $
 # Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
 # Contributor (Arch): Mateusz Herych <heniekk@gmail.com>
 # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org>
@@ -7,23 +7,33 @@
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
-_extramodules=extramodules-3.14-LIBRE
-pkgrel=27
+_extramodules=extramodules-3.15-LIBRE
+pkgrel=29
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.14' 'linux-libre<3.15')
-makedepends=('linux-libre-headers>=3.14' 'linux-libre-headers<3.15')
+depends=('linux-libre>=3.15' 'linux-libre<3.16')
+makedepends=('linux-libre-headers>=3.15' 'linux-libre-headers<3.16')
 options=(!makeflags)
 install=$_pkgname.install
 replaces=('vhba-module')
 conflicts=('vhba-module')
 provides=("vhba-module=$pkgver")
 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-libre 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