[arch-commits] Commit in vhba-module/repos (10 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Mon Jun 9 12:15:01 UTC 2014


    Date: Monday, June 9, 2014 @ 14:15:01
  Author: foutrelis
Revision: 112897

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  vhba-module/repos/community-testing-i686/
  vhba-module/repos/community-testing-i686/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
    (from rev 112896, vhba-module/trunk/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch)
  vhba-module/repos/community-testing-i686/60-vhba.rules
    (from rev 112896, vhba-module/trunk/60-vhba.rules)
  vhba-module/repos/community-testing-i686/PKGBUILD
    (from rev 112896, vhba-module/trunk/PKGBUILD)
  vhba-module/repos/community-testing-i686/vhba-module.install
    (from rev 112896, vhba-module/trunk/vhba-module.install)
  vhba-module/repos/community-testing-x86_64/
  vhba-module/repos/community-testing-x86_64/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch
    (from rev 112896, vhba-module/trunk/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch)
  vhba-module/repos/community-testing-x86_64/60-vhba.rules
    (from rev 112896, vhba-module/trunk/60-vhba.rules)
  vhba-module/repos/community-testing-x86_64/PKGBUILD
    (from rev 112896, vhba-module/trunk/PKGBUILD)
  vhba-module/repos/community-testing-x86_64/vhba-module.install
    (from rev 112896, vhba-module/trunk/vhba-module.install)

------------------------------------------------------------------------------------------+
 community-testing-i686/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch   |   54 ++++++++++
 community-testing-i686/60-vhba.rules                                                     |    1 
 community-testing-i686/PKGBUILD                                                          |   50 +++++++++
 community-testing-i686/vhba-module.install                                               |   22 ++++
 community-testing-x86_64/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch |   54 ++++++++++
 community-testing-x86_64/60-vhba.rules                                                   |    1 
 community-testing-x86_64/PKGBUILD                                                        |   50 +++++++++
 community-testing-x86_64/vhba-module.install                                             |   22 ++++
 8 files changed, 254 insertions(+)

Copied: vhba-module/repos/community-testing-i686/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch (from rev 112896, vhba-module/trunk/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch)
===================================================================
--- community-testing-i686/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch	                        (rev 0)
+++ community-testing-i686/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch	2014-06-09 12:15:01 UTC (rev 112897)
@@ -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
+

Copied: vhba-module/repos/community-testing-i686/60-vhba.rules (from rev 112896, vhba-module/trunk/60-vhba.rules)
===================================================================
--- community-testing-i686/60-vhba.rules	                        (rev 0)
+++ community-testing-i686/60-vhba.rules	2014-06-09 12:15:01 UTC (rev 112897)
@@ -0,0 +1 @@
+ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess"

Copied: vhba-module/repos/community-testing-i686/PKGBUILD (from rev 112896, vhba-module/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2014-06-09 12:15:01 UTC (rev 112897)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Mateusz Herych <heniekk at gmail.com>
+# Contributor: Charles Lindsay <charles at chaoslizard.org>
+
+pkgname=vhba-module
+pkgver=20130607
+_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.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'
+        '0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch')
+md5sums=('660df41d08b1fd86baad1f16a0264438'
+         '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)"
+  make KDIR=/usr/lib/modules/$_kernver/build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+  install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+
+  cd $startdir
+  cp -f $install ${install}.pkg
+  true && install=${install}.pkg
+  sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vhba-module/repos/community-testing-i686/vhba-module.install (from rev 112896, vhba-module/trunk/vhba-module.install)
===================================================================
--- community-testing-i686/vhba-module.install	                        (rev 0)
+++ community-testing-i686/vhba-module.install	2014-06-09 12:15:01 UTC (rev 112897)
@@ -0,0 +1,22 @@
+EXTRAMODULES=
+
+_updatemod() {
+  echo "  > Updating module dependencies..."
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_upgrade() {
+  getent group cdemu &>/dev/null || groupadd -r cdemu
+  _updatemod
+}
+
+post_remove() {
+  _updatemod
+  groupdel cdemu
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vhba-module/repos/community-testing-x86_64/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch (from rev 112896, vhba-module/trunk/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch)
===================================================================
--- community-testing-x86_64/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch	                        (rev 0)
+++ community-testing-x86_64/0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch	2014-06-09 12:15:01 UTC (rev 112897)
@@ -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
+

Copied: vhba-module/repos/community-testing-x86_64/60-vhba.rules (from rev 112896, vhba-module/trunk/60-vhba.rules)
===================================================================
--- community-testing-x86_64/60-vhba.rules	                        (rev 0)
+++ community-testing-x86_64/60-vhba.rules	2014-06-09 12:15:01 UTC (rev 112897)
@@ -0,0 +1 @@
+ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess"

Copied: vhba-module/repos/community-testing-x86_64/PKGBUILD (from rev 112896, vhba-module/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2014-06-09 12:15:01 UTC (rev 112897)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Mateusz Herych <heniekk at gmail.com>
+# Contributor: Charles Lindsay <charles at chaoslizard.org>
+
+pkgname=vhba-module
+pkgver=20130607
+_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.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'
+        '0001-VHBA-module-define-scmd_dbg-and-scmd_warn-macros-onl.patch')
+md5sums=('660df41d08b1fd86baad1f16a0264438'
+         '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)"
+  make KDIR=/usr/lib/modules/$_kernver/build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+  install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+
+  cd $startdir
+  cp -f $install ${install}.pkg
+  true && install=${install}.pkg
+  sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vhba-module/repos/community-testing-x86_64/vhba-module.install (from rev 112896, vhba-module/trunk/vhba-module.install)
===================================================================
--- community-testing-x86_64/vhba-module.install	                        (rev 0)
+++ community-testing-x86_64/vhba-module.install	2014-06-09 12:15:01 UTC (rev 112897)
@@ -0,0 +1,22 @@
+EXTRAMODULES=
+
+_updatemod() {
+  echo "  > Updating module dependencies..."
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_upgrade() {
+  getent group cdemu &>/dev/null || groupadd -r cdemu
+  _updatemod
+}
+
+post_remove() {
+  _updatemod
+  groupdel cdemu
+}
+
+# vim:set ts=2 sw=2 et:




More information about the arch-commits mailing list