4 files changed, 24 insertions, 21 deletions
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index eff2034da..28b75bd71 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77194 2012-10-06 11:13:30Z tpowa $
+# $Id: PKGBUILD 77842 2012-10-15 05:19:18Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.0
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -16,7 +16,8 @@ makedepends=('linux-headers'
 
 build() {
   # current kernel version
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _kernver=3.6.0-1-ARCH
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -30,12 +31,13 @@ build() {
 
 package_virtualbox-host-modules(){
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux>=3.5' 'linux<3.6')
+  depends=('linux>=3.6' 'linux<3.7')
   replaces=('virtualbox-modules')
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
 
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=$(expac -Q '%v' linux-headers)-ARCH
+   _kernver=3.6.0-1-ARCH
   _extraver=extramodules-${_kernver%.*}-ARCH
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
@@ -48,19 +50,20 @@ package_virtualbox-host-modules(){
 package_virtualbox-guest-modules(){
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=('linux>=3.5' 'linux<3.6')
+  depends=('linux>=3.6' 'linux<3.7')
   replaces=('virtualbox-archlinux-modules')
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
 
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  #_kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _kernver=3.6.0-1-ARCH
   _extraver=extramodules-${_kernver%.*}-ARCH
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$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 9b0e6fca8..828448cab 100755
--- a/community/virtualbox-modules/build.sh
+++ b/community/virtualbox-modules/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if (( $# != 2 )); then
-  echo "usage: $0 extra multilib"
-  echo "       $0 testing multilib-testing"
+if (( $# != 1 )); then
+  echo "usage: $0 extra"
+  echo "       $0 testing"
   exit 1
 fi
 
@@ -11,10 +11,10 @@ linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pk
 linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
 
-$2-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$2-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$2-x86_64
-makechrootpkg -r /var/lib/archbuild/$2-x86_64
+$1-x86_64-build
+makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -r /var/lib/archbuild/$1-x86_64
 
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index 15d536b7f..e5d1038af 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index 9b7b8c444..3f2ed4a10 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
+    EXTRAMODULES='extramodules-3.6-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }