updating virtualbox-modules for linux-libre 3.4

4 files changed, 28 insertions, 12 deletions

diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 9b36d7cf3..5fd7f6322 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -6,19 +6,22 @@
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
 pkgver=4.1.14
-pkgrel=2.1
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
-         LocalConfig.kmk 60-vboxguest.rules)
+         LocalConfig.kmk 
+	 60-vboxguest.rules
+         linux34.patch)
 md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414'
          '4c88bd122677a35f68abd76eb01b378b'
-         'ed1341881437455d9735875ddf455fbe')
+         'ed1341881437455d9735875ddf455fbe'
+         '29ae9b90c26d2ce6919710228dbc5def')
 
-_extramodules=extramodules-3.3-LIBRE
+_extramodules=extramodules-3.4-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version || true)"
 
 export KERN_DIR=/lib/modules/${_kernver}/build
@@ -26,6 +29,7 @@ export KERN_INCL=/usr/src/linux-${_kernver}/include/
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}"
+    patch -Np1 -i "$srcdir/linux34.patch"
 
     cp "$srcdir/LocalConfig.kmk" .
 
@@ -53,7 +57,7 @@ package_virtualbox-parabola-modules(){
     pkgdesc="Additions only for Parabola guests (kernel modules)"
     license=('GPL')
     install=virtualbox-parabola-modules.install
-    depends=('linux-libre>=3.3' 'linux-libre<3.4')
+    depends=('linux-libre>=3.4' 'linux-libre<3.5')
     replaces=('virtualbox-archlinux-modules')
     conflicts=('virtualbox-archlinux-modules')
     provides=("virtualbox-archlinux-modules=$pkgver")
@@ -79,7 +83,7 @@ package_virtualbox-modules(){
     pkgdesc="Kernel modules for VirtualBox"
     license=('GPL')
     install=virtualbox-modules.install
-    depends=('linux-libre>=3.3' 'linux-libre<3.4')
+    depends=('linux-libre>=3.4' 'linux-libre<3.5')
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
diff --git a/libre/virtualbox-modules/linux34.patch b/libre/virtualbox-modules/linux34.patch
new file mode 100644
index 000000000..05ec78557
--- /dev/null
+++ b/libre/virtualbox-modules/linux34.patch
@@ -0,0 +1,12 @@
+diff -Nur VirtualBox-4.1.14.orig/Config.kmk VirtualBox-4.1.14/Config.kmk
+--- VirtualBox-4.1.14.orig/Config.kmk	2012-04-26 16:56:21.000000000 +0000
++++ VirtualBox-4.1.14/Config.kmk	2012-05-21 14:35:22.348398884 +0000
+@@ -2856,7 +2856,7 @@
+ TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \
+	-fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \
+	-Wno-sign-compare -Wdeclaration-after-statement
+-TEMPLATE_VBOXR0DRV_CXXFLAGS            = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti
++TEMPLATE_VBOXR0DRV_CXXFLAGS            = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti -fpermissive
+   ifndef VBOX_LINUX_VERSION_2_4
+ # 2.6
+ TEMPLATE_VBOXR0DRV_SYSSUFF             = .ko
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index 72be196c2..14242eaf4 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.3-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.3-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.3-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index 0cc4b44fd..0e101aedf 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.3-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.3-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.3-LIBRE'
+    EXTRAMODULES='extramodules-3.4-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }