Sun Mar 3 01:04:55 PST 2013

2 files changed, 26 insertions, 20 deletions

diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 1116a6c5b..b72f74640 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 84040 2013-02-09 01:31:49Z foutrelis $
+# $Id: PKGBUILD 85488 2013-03-02 01:43:50Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.6
-pkgrel=6
+pkgver=4.2.8
+_extramodules=extramodules-3.7-ARCH
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -16,7 +17,7 @@ makedepends=('linux-headers'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
@@ -30,8 +31,7 @@ build() {
 }
 
 package_virtualbox-host-modules(){
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  _extraver=extramodules-${_kernver%.*}-ARCH
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   pkgdesc='Host kernel modules for VirtualBox'
   depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)")
@@ -39,16 +39,15 @@ package_virtualbox-host-modules(){
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-host-modules.install"
 }
 
 package_virtualbox-guest-modules(){
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  _extraver=extramodules-${_kernver%.*}-ARCH
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
@@ -57,11 +56,11 @@ package_virtualbox-guest-modules(){
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh
index 476449541..744f18330 100755
--- a/community/virtualbox-modules/build.sh
+++ b/community/virtualbox-modules/build.sh
@@ -1,18 +1,25 @@
 #!/bin/bash
 
+set -e
+
 if (( $# != 1 )); then
   echo "usage: $0 extra"
   echo "       $0 testing"
   exit 1
 fi
 
-linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
+here=$PWD
+cd /var/empty
+linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
+cd "$here"
+linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
 
-makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -r /var/lib/archbuild/$1-x86_64
+cd /var/empty
+makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+cd "$here"
+makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
 
 
 # vim:set ts=2 sw=2 ft=sh et: