system/vhba-module: Updated for version 20140928.

Fixes build failure on -current.

Signed-off-by: David Spencer <baildon.research@googlemail.com>

3 files changed, 18 insertions, 21 deletions

diff --git a/system/vhba-module/slack-desc b/system/vhba-module/slack-desc
index f8bd56491da5a..8f4aaa353c37e 100644
--- a/system/vhba-module/slack-desc
+++ b/system/vhba-module/slack-desc
@@ -14,6 +14,6 @@ vhba-module: the SCSI layer with a virtual SCSI adapter which can have
 vhba-module: multiple virtual devices. It is part of the userspace-cdemu
 vhba-module: suite, a free, GPL CD/DVD-ROM device emulator for linux.
 vhba-module:
-vhba-module: Homepage: http://cdemu.sourceforge.net/pkg_vhba.php
+vhba-module: Homepage: http://cdemu.sourceforge.net/about/vhba/
 vhba-module:
 vhba-module:
diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild
index b96cfbacfd75b..a3f2501c2275b 100644
--- a/system/vhba-module/vhba-module.SlackBuild
+++ b/system/vhba-module/vhba-module.SlackBuild
@@ -23,20 +23,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2012/09/15
-
 PRGNAM=vhba-module
-VERSION=${VERSION:-20120422}
+VERSION=${VERSION:-20140928}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+# Setting ARCH is not supported (and the build crashes if ARCH is exported).
+unset ARCH
+case "$( uname -m )" in
+  i?86) SLKARCH=i486 ;;
+  arm*) SLKARCH=arm ;;
+     *) SLKARCH=$( uname -m ) ;;
+esac
 
 KERNEL=${KERNEL:-$(uname -r)}
 PKGKERNEL=$(echo $KERNEL | tr - _)
@@ -51,18 +49,17 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRC_VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Use -j1 to avoid problems if larger number of jobs is defined in MAKEFLAGS
-make -j1 KERNELRELEASE=$KERNEL
+make KERNELRELEASE=$KERNEL
 
 mkdir -p $PKG/lib/modules/$KERNEL/extra
 install -m 0644 vhba.ko $PKG/lib/modules/$KERNEL/extra/
@@ -78,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}_$PKGKERNEL-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$SLKARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/vhba-module/vhba-module.info b/system/vhba-module/vhba-module.info
index 26f2e056ceb13..3c2b69591accd 100644
--- a/system/vhba-module/vhba-module.info
+++ b/system/vhba-module/vhba-module.info
@@ -1,8 +1,8 @@
 PRGNAM="vhba-module"
-VERSION="20120422"
-HOMEPAGE="http://cdemu.sourceforge.net/pkg_vhba.php"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20120422.tar.bz2"
-MD5SUM="d97372da1d270d1605742b2995fb6678"
+VERSION="20140928"
+HOMEPAGE="http://cdemu.sourceforge.net/about/vhba/"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20140928.tar.bz2"
+MD5SUM="967007230bb028424216d9b35da422c0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""