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

Tobias Powalowski tpowa at archlinux.org
Mon May 22 13:21:27 UTC 2017 

    Date: Monday, May 22, 2017 @ 13:21:27
  Author: tpowa
Revision: 229097

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-compatibility-fix-for-upcoming-kernel-4.11.patch
    (from rev 229095, vhba-module/trunk/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch)
  vhba-module/repos/community-testing-i686/60-vhba.rules
    (from rev 229095, vhba-module/trunk/60-vhba.rules)
  vhba-module/repos/community-testing-i686/PKGBUILD
    (from rev 229096, vhba-module/trunk/PKGBUILD)
  vhba-module/repos/community-testing-i686/vhba-module.install
    (from rev 229096, vhba-module/trunk/vhba-module.install)
  vhba-module/repos/community-testing-x86_64/
  vhba-module/repos/community-testing-x86_64/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch
    (from rev 229096, vhba-module/trunk/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch)
  vhba-module/repos/community-testing-x86_64/60-vhba.rules
    (from rev 229096, vhba-module/trunk/60-vhba.rules)
  vhba-module/repos/community-testing-x86_64/PKGBUILD
    (from rev 229096, vhba-module/trunk/PKGBUILD)
  vhba-module/repos/community-testing-x86_64/vhba-module.install
    (from rev 229096, vhba-module/trunk/vhba-module.install)

-------------------------------------------------------------------------------------+
 community-testing-i686/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch   |   41 ++++++++
 community-testing-i686/60-vhba.rules                                                |    1 
 community-testing-i686/PKGBUILD                                                     |   47 ++++++++++
 community-testing-i686/vhba-module.install                                          |   21 ++++
 community-testing-x86_64/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch |   41 ++++++++
 community-testing-x86_64/60-vhba.rules                                              |    1 
 community-testing-x86_64/PKGBUILD                                                   |   47 ++++++++++
 community-testing-x86_64/vhba-module.install                                        |   21 ++++
 8 files changed, 220 insertions(+)

Copied: vhba-module/repos/community-testing-i686/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch (from rev 229095, vhba-module/trunk/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch)
===================================================================
--- community-testing-i686/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch	                        (rev 0)
+++ community-testing-i686/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch	2017-05-22 13:21:27 UTC (rev 229097)
@@ -0,0 +1,41 @@
+From 7dc0d29a3ef6e45455f537c8187791446ca7e1e5 Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <rok.mandeljc at gmail.com>
+Date: Sun, 26 Mar 2017 17:09:42 +0200
+Subject: [PATCH] VHBA: compatibility fix for upcoming kernel 4.11
+
+As per Bug #104, from 4.11-rc2 on, we need to include linux/sched/signal.h
+instead of linux/sched.h
+---
+ vhba-module/vhba.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
+index 4a14a10e955000bb..ff30e4cb51b61ec6 100644
+--- a/vhba-module/vhba.c
++++ b/vhba-module/vhba.c
+@@ -18,16 +18,21 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include <linux/version.h>
++
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/highmem.h>
+ #include <linux/fs.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#else
+ #include <linux/sched.h>
++#endif
+ #include <linux/platform_device.h>
+ #include <linux/miscdevice.h>
+ #include <linux/poll.h>
+ #include <linux/slab.h>
+-#include <linux/version.h>
+ #ifdef CONFIG_COMPAT
+ #include <linux/compat.h>
+ #endif
+-- 
+2.12.2
+

Copied: vhba-module/repos/community-testing-i686/60-vhba.rules (from rev 229095, vhba-module/trunk/60-vhba.rules)
===================================================================
--- community-testing-i686/60-vhba.rules	                        (rev 0)
+++ community-testing-i686/60-vhba.rules	2017-05-22 13:21:27 UTC (rev 229097)
@@ -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 229096, vhba-module/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2017-05-22 13:21:27 UTC (rev 229097)
@@ -0,0 +1,47 @@
+# $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=20161009
+_extramodules=extramodules-4.11-ARCH
+pkgrel=13
+pkgdesc="Kernel module that emulates SCSI devices"
+arch=('i686' 'x86_64')
+url="http://cdemu.sourceforge.net/"
+license=('GPL')
+depends=('linux>=4.11' 'linux<4.12')
+makedepends=('linux-headers>=4.11' 'linux-headers<4.12')
+options=(!makeflags)
+install=$pkgname.install
+source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
+        0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch
+        '60-vhba.rules')
+sha256sums=('cd062d8bd61ccb8137622f837a0dadb771cc935981d8bccb2ad4de0bd11f33d9'
+            'a756b78865bfc1ea7eda447cd209035f9da7982174d03e643af3441d50ab3e08'
+            '3052cb1cadbdf4bfb0b588bb8ed80691940d8dd63dc5502943d597eaf9f40c3b')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np2 -i ../0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.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 229096, vhba-module/trunk/vhba-module.install)
===================================================================
--- community-testing-i686/vhba-module.install	                        (rev 0)
+++ community-testing-i686/vhba-module.install	2017-05-22 13:21:27 UTC (rev 229097)
@@ -0,0 +1,21 @@
+EXTRAMODULES=
+
+_updatemod() {
+  echo "  > Updating module dependencies..."
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+  getent group cdemu &>/dev/null || groupadd -r cdemu
+  _updatemod
+}
+
+post_upgrade() {
+  _updatemod
+}
+
+post_remove() {
+  _updatemod
+}
+
+# vim:set ts=2 sw=2 et:

Copied: vhba-module/repos/community-testing-x86_64/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch (from rev 229096, vhba-module/trunk/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch)
===================================================================
--- community-testing-x86_64/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch	                        (rev 0)
+++ community-testing-x86_64/0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch	2017-05-22 13:21:27 UTC (rev 229097)
@@ -0,0 +1,41 @@
+From 7dc0d29a3ef6e45455f537c8187791446ca7e1e5 Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <rok.mandeljc at gmail.com>
+Date: Sun, 26 Mar 2017 17:09:42 +0200
+Subject: [PATCH] VHBA: compatibility fix for upcoming kernel 4.11
+
+As per Bug #104, from 4.11-rc2 on, we need to include linux/sched/signal.h
+instead of linux/sched.h
+---
+ vhba-module/vhba.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
+index 4a14a10e955000bb..ff30e4cb51b61ec6 100644
+--- a/vhba-module/vhba.c
++++ b/vhba-module/vhba.c
+@@ -18,16 +18,21 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include <linux/version.h>
++
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/highmem.h>
+ #include <linux/fs.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#else
+ #include <linux/sched.h>
++#endif
+ #include <linux/platform_device.h>
+ #include <linux/miscdevice.h>
+ #include <linux/poll.h>
+ #include <linux/slab.h>
+-#include <linux/version.h>
+ #ifdef CONFIG_COMPAT
+ #include <linux/compat.h>
+ #endif
+-- 
+2.12.2
+

Copied: vhba-module/repos/community-testing-x86_64/60-vhba.rules (from rev 229096, vhba-module/trunk/60-vhba.rules)
===================================================================
--- community-testing-x86_64/60-vhba.rules	                        (rev 0)
+++ community-testing-x86_64/60-vhba.rules	2017-05-22 13:21:27 UTC (rev 229097)
@@ -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 229096, vhba-module/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2017-05-22 13:21:27 UTC (rev 229097)
@@ -0,0 +1,47 @@
+# $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=20161009
+_extramodules=extramodules-4.11-ARCH
+pkgrel=13
+pkgdesc="Kernel module that emulates SCSI devices"
+arch=('i686' 'x86_64')
+url="http://cdemu.sourceforge.net/"
+license=('GPL')
+depends=('linux>=4.11' 'linux<4.12')
+makedepends=('linux-headers>=4.11' 'linux-headers<4.12')
+options=(!makeflags)
+install=$pkgname.install
+source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
+        0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.patch
+        '60-vhba.rules')
+sha256sums=('cd062d8bd61ccb8137622f837a0dadb771cc935981d8bccb2ad4de0bd11f33d9'
+            'a756b78865bfc1ea7eda447cd209035f9da7982174d03e643af3441d50ab3e08'
+            '3052cb1cadbdf4bfb0b588bb8ed80691940d8dd63dc5502943d597eaf9f40c3b')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np2 -i ../0001-VHBA-compatibility-fix-for-upcoming-kernel-4.11.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 229096, vhba-module/trunk/vhba-module.install)
===================================================================
--- community-testing-x86_64/vhba-module.install	                        (rev 0)
+++ community-testing-x86_64/vhba-module.install	2017-05-22 13:21:27 UTC (rev 229097)
@@ -0,0 +1,21 @@
+EXTRAMODULES=
+
+_updatemod() {
+  echo "  > Updating module dependencies..."
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+  getent group cdemu &>/dev/null || groupadd -r cdemu
+  _updatemod
+}
+
+post_upgrade() {
+  _updatemod
+}
+
+post_remove() {
+  _updatemod
+}
+
+# vim:set ts=2 sw=2 et:

More information about the arch-commits mailing list