5.0.20-2

4 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3cdee96ad6e7..d57451ac9d96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,23 @@
 pkgbase = virtualbox-modules-mainline
 	pkgver = 5.0.20
-	pkgrel = 1
+	pkgrel = 2
 	url = http://virtualbox.org
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = dkms
-	makedepends = linux-mainline-headers>=4.6rc1
-	makedepends = linux-mainline-headers<4.7rc1
+	makedepends = linux-mainline-headers>=4.7rc1
+	makedepends = linux-mainline-headers<4.8rc1
 	makedepends = virtualbox-host-dkms>=5.0.20
 	makedepends = virtualbox-guest-dkms>=5.0.20
-	depends = linux-mainline>=4.6rc1
-	depends = linux-mainline<4.7rc1
+	depends = linux-mainline>=4.7rc1
+	depends = linux-mainline<4.8rc1
 
 pkgname = virtualbox-host-modules-mainline
 	pkgdesc = Host kernel modules for VirtualBox running under linux-mainline
 	install = virtualbox-host-modules-mainline.install
-	depends = linux-mainline>=4.6rc1
-	depends = linux-mainline<4.7rc1
+	depends = linux-mainline>=4.7rc1
+	depends = linux-mainline<4.8rc1
 	provides = virtualbox-host-modules
 	conflicts = virtualbox-modules-mainline
 
@@ -25,8 +25,8 @@ pkgname = virtualbox-guest-modules-mainline
 	pkgdesc = Guest kernel modules for VirtualBox running under linux-mainline
 	install = virtualbox-guest-modules-mainline.install
 	license = GPL
-	depends = linux-mainline>=4.6rc1
-	depends = linux-mainline<4.7rc1
+	depends = linux-mainline>=4.7rc1
+	depends = linux-mainline<4.8rc1
 	provides = virtualbox-guest-modules
 	conflicts = virtualbox-modules-mainline
 
diff --git a/PKGBUILD b/PKGBUILD
index 083a9bf064ef..3bb29aca4fa9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
 pkgbase=virtualbox-modules-mainline
 pkgname=('virtualbox-host-modules-mainline' 'virtualbox-guest-modules-mainline')
 pkgver=5.0.20
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-depends=('linux-mainline>=4.6rc1' 'linux-mainline<4.7rc1')
-makedepends=('dkms' 'linux-mainline-headers>=4.6rc1' 'linux-mainline-headers<4.7rc1' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver")
+depends=('linux-mainline>=4.7rc1' 'linux-mainline<4.8rc1')
+makedepends=('dkms' 'linux-mainline-headers>=4.7rc1' 'linux-mainline-headers<4.8rc1' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver")
 # remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-4.6-mainline
+_extramodules=extramodules-4.7-mainline
 
 prepare() {
   _kernver=$(cat /usr/lib/modules/$_extramodules/version)
@@ -25,13 +25,19 @@ prepare() {
 
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
 
-  # workaround to patch for linux 4.6
+  # add patches here if needed
   rm -r $srcdir/dkms/vboxhost/${pkgver}_OSE/source
   cp -r /usr/src/vboxhost-${pkgver}_OSE $srcdir/dkms/vboxhost/${pkgver}_OSE/source
 
+  cp ../VBoxNetAdp-linux.c $srcdir/dkms/vboxhost/${pkgver}_OSE/source/vboxnetadp/linux/VBoxNetAdp-linux.c
+  
   rm -r $srcdir/dkms/vboxguest/${pkgver}_OSE/source
   cp -r /usr/src/vboxguest-${pkgver}_OSE $srcdir/dkms/vboxguest/${pkgver}_OSE/source
 
+  cp ../vbox_main.c $srcdir/dkms/vboxguest/${pkgver}_OSE/source/vboxvideo/vbox_main.c
+  cp ../vbox_mode.c $srcdir/dkms/vboxguest/${pkgver}_OSE/source/vboxvideo/vbox_mode.c
+  cp ../vbox_drv.h $srcdir/dkms/vboxguest/${pkgver}_OSE/source/vboxvideo/vbox_drv.h
+
   cd $srcdir
 }
 
@@ -48,7 +54,7 @@ build() {
 package_virtualbox-host-modules-mainline(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Host kernel modules for VirtualBox running under linux-mainline'
-  depends=('linux-mainline>=4.6rc1' 'linux-mainline<4.7rc1')
+  depends=('linux-mainline>=4.7rc1' 'linux-mainline<4.8rc1')
   provides=("virtualbox-host-modules")
   conflicts=('virtualbox-modules-mainline')
   install=virtualbox-host-modules-mainline.install
@@ -63,7 +69,7 @@ package_virtualbox-guest-modules-mainline(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Guest kernel modules for VirtualBox running under linux-mainline'
   license=('GPL')
-  depends=('linux-mainline>=4.6rc1' 'linux-mainline<4.7rc1')
+  depends=('linux-mainline>=4.7rc1' 'linux-mainline<4.8rc1')
   provides=("virtualbox-guest-modules")
   conflicts=('virtualbox-modules-mainline')
   install=virtualbox-guest-modules-mainline.install
diff --git a/virtualbox-guest-modules-mainline.install b/virtualbox-guest-modules-mainline.install
index e543936a95fd..114383bac9c6 100644
--- a/virtualbox-guest-modules-mainline.install
+++ b/virtualbox-guest-modules-mainline.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES=extramodules-4.6-mainline
+  EXTRAMODULES=extramodules-4.7-mainline
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/virtualbox-host-modules-mainline.install b/virtualbox-host-modules-mainline.install
index 64510453a1bb..6c4115dd4e78 100644
--- a/virtualbox-host-modules-mainline.install
+++ b/virtualbox-host-modules-mainline.install
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES=extramodules-4.6-mainline
+  EXTRAMODULES=extramodules-4.7-mainline
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }