aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--system/vhba-module/vhba-module.SlackBuild25
-rw-r--r--system/vhba-module/vhba-module.info12
-rw-r--r--system/vhba-module/vhba-update_to_svn.diff85
3 files changed, 21 insertions, 101 deletions
diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild
index 7d8e33450d21..991d64688097 100644
--- a/system/vhba-module/vhba-module.SlackBuild
+++ b/system/vhba-module/vhba-module.SlackBuild
@@ -2,7 +2,8 @@
# Slackware build script for vhba-module
-# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2010 Niels Horn <niels.horn@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,8 +23,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Maintained as of version 20100822 by Niels Horn <niels.horn@gmail.com>
+# Revision date: 2010/11/20
+
PRGNAM=vhba-module
-SRC_VERSION=1.2.1
+VERSION=${VERSION:-20100822}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -36,7 +40,7 @@ if [ -z "$ARCH" ]; then
fi
KERNEL=${KERNEL:-$(uname -r)}
-VERSION=${SRC_VERSION}_$(echo $KERNEL | tr - _)
+PKGKERNEL=${KERNEL//-/_}
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
@@ -49,20 +53,21 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.bz2
-cd $PRGNAM-$SRC_VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# Bring vhba.c up to date with the svn repo copy
-patch -p1 < $CWD/vhba-update_to_svn.diff
-
-make KERNELRELEASE=$KERNEL
+# Use -j1 to avoid problems if larger number of jobs is defined in MAKEFLAGS
+make -j1 KERNELRELEASE=$KERNEL
mkdir -p $PKG/lib/modules/$KERNEL/extra
install -m 0644 vhba.ko $PKG/lib/modules/$KERNEL/extra/
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING ChangeLog INSTALL NEWS README \
+ $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
@@ -70,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/vhba-module/vhba-module.info b/system/vhba-module/vhba-module.info
index c62c6b339121..a14a014b010d 100644
--- a/system/vhba-module/vhba-module.info
+++ b/system/vhba-module/vhba-module.info
@@ -1,10 +1,10 @@
PRGNAM="vhba-module"
-VERSION="1.2.1"
+VERSION="20100822"
HOMEPAGE="http://cdemu.sourceforge.net/pkg_vhba.php"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-1.2.1.tar.bz2"
-MD5SUM="a3b6ad798f2b72ef599df797ef79e5ec"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20100822.tar.gz"
+MD5SUM="1d2f06ae33c5d15b7c29e467e4658aa2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Niklas 'Nille' Åkerström"
-EMAIL="nille.kungen[AT]gmail.com"
-APPROVED="rworkman"
+MAINTAINER="Niels Horn"
+EMAIL="niels.horn@gmail.com"
+APPROVED="pprkut"
diff --git a/system/vhba-module/vhba-update_to_svn.diff b/system/vhba-module/vhba-update_to_svn.diff
deleted file mode 100644
index 41591380eae9..000000000000
--- a/system/vhba-module/vhba-update_to_svn.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Nur vhba-module-1.2.1.orig//kat/have_scsi_macros.c vhba-module-1.2.1/kat/have_scsi_macros.c
---- vhba-module-1.2.1.orig//kat/have_scsi_macros.c 2009-01-17 17:21:16.000000000 -0600
-+++ vhba-module-1.2.1/kat/have_scsi_macros.c 2010-06-30 23:41:37.203194236 -0500
-@@ -1,4 +1,3 @@
--#include <linux/autoconf.h>
- #include <scsi/scsi_cmnd.h>
-
- void testfunc (void);
-diff -Nur vhba-module-1.2.1.orig//kat/scatterlist_has_page_link.c vhba-module-1.2.1/kat/scatterlist_has_page_link.c
---- vhba-module-1.2.1.orig//kat/scatterlist_has_page_link.c 2009-01-17 17:21:16.000000000 -0600
-+++ vhba-module-1.2.1/kat/scatterlist_has_page_link.c 2010-06-30 23:40:49.982069552 -0500
-@@ -1,4 +1,3 @@
--#include <linux/autoconf.h>
- #include <linux/scatterlist.h>
-
- /* Note: scatterlist.page_link is used in kernel (2.6.24 <= version < X) */
-diff -Nur vhba-module-1.2.1.orig//vhba.c vhba-module-1.2.1/vhba.c
---- vhba-module-1.2.1.orig//vhba.c 2009-01-17 17:21:16.000000000 -0600
-+++ vhba-module-1.2.1/vhba.c 2010-06-30 23:40:14.430097774 -0500
-@@ -1,7 +1,7 @@
- /*
- * vhba.c
- *
-- * Copyright (C) 2007 Chia-I Wu <b90201047 AT ntu DOT edu DOT tw>
-+ * Copyright (C) 2007-2010 Chia-I Wu <b90201047 AT ntu DOT edu DOT tw>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
-@@ -26,6 +26,10 @@
- #include <linux/platform_device.h>
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
-+#include <linux/slab.h>
-+#ifdef CONFIG_COMPAT
-+#include <linux/compat.h>
-+#endif
- #include <asm/uaccess.h>
- #include <scsi/scsi.h>
- #include <scsi/scsi_host.h>
-@@ -52,7 +56,7 @@
- dev_warn(&(scmd)->device->sdev_gendev, fmt, ##a)
-
-
--#define VHBA_MAX_SECTORS_PER_IO 128
-+#define VHBA_MAX_SECTORS_PER_IO 256
- #define VHBA_MAX_ID 32
- #define VHBA_CAN_QUEUE 32
- #define VHBA_INVALID_ID VHBA_MAX_ID
-@@ -671,7 +675,7 @@
- return ret;
- }
-
--static int vhba_ctl_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-+static long vhba_ctl_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
- {
- struct vhba_device *vdev = file->private_data;
- struct vhba_host *vhost;
-@@ -704,6 +708,15 @@
- return -ENOTTY;
- }
-
-+#ifdef CONFIG_COMPAT
-+static long vhba_ctl_compat_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+ unsigned long compat_arg = (unsigned long)compat_ptr(arg);
-+
-+ return vhba_ctl_ioctl(file, cmd, compat_arg);
-+}
-+#endif
-+
- static unsigned int vhba_ctl_poll(struct file *file, poll_table *wait)
- {
- struct vhba_device *vdev = file->private_data;
-@@ -781,7 +794,10 @@
- .read = vhba_ctl_read,
- .write = vhba_ctl_write,
- .poll = vhba_ctl_poll,
-- .ioctl = vhba_ctl_ioctl,
-+ .unlocked_ioctl = vhba_ctl_ioctl,
-+#ifdef CONFIG_COMPAT
-+ .compat_ioctl = vhba_ctl_compat_ioctl,
-+#endif
- };
-
- static struct miscdevice vhba_miscdev = {
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-23 12:52:23 +0000