Update to 5.2.0-3

4 files changed, 27 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ec09b6f85a2..1838823c58cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Nov  8 20:15:59 UTC 2017
+# Tue Nov 21 20:41:02 UTC 2017
 pkgbase = virtualbox-ck-modules
 	pkgver = 5.2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://virtualbox.org
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = linux-ck-headers
@@ -14,16 +13,14 @@ pkgbase = virtualbox-ck-modules
 
 pkgname = virtualbox-ck-host-modules
 	pkgdesc = Host kernel modules for VirtualBox running under Linux-ck.
-	install = host.install
-	depends = linux-ck>=4.13
-	depends = linux-ck<4.14
+	depends = linux-ck>=4.14
+	depends = linux-ck<4.15
 	provides = VIRTUALBOX-HOST-MODULES
 
 pkgname = virtualbox-ck-guest-modules
 	pkgdesc = Guest kernel modules for VirtualBox running under Linux-ck.
-	install = guest.install
 	license = GPL
-	depends = linux-ck>=4.13
-	depends = linux-ck<4.14
+	depends = linux-ck>=4.14
+	depends = linux-ck<4.15
 	provides = VIRTUALBOX-GUEST-MODULES
 
diff --git a/PKGBUILD b/PKGBUILD
index 6becf0a374be..f0d3ae06cce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
 pkgbase=(virtualbox-ck-modules)
 pkgname=(virtualbox-ck-host-modules virtualbox-ck-guest-modules)
 pkgver=5.2.0
-pkgrel=2
-arch=('i686' 'x86_64')
+pkgrel=3
+arch=('x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-ck-headers' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'dkms')
 
-_extramodules=extramodules-4.13-ck
+_extramodules=extramodules-4.14-ck
 _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
 build() {
@@ -30,23 +30,19 @@ package_virtualbox-ck-host-modules() {
 	#pkgdesc="${_Hpkgdesc}"
 	pkgdesc='Host kernel modules for VirtualBox running under Linux-ck.'
 	provides=("VIRTUALBOX-HOST-MODULES")
-	depends=('linux-ck>=4.13' 'linux-ck<4.14')
+	depends=('linux-ck>=4.14' 'linux-ck<4.15')
 	#replaces=('virtualbox-ck-host-modules-corex')
 	#groups=('ck-generic')
-	install=host.install
 
-	install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
 	cd "dkms/vboxhost/${pkgver}_OSE/$_kernver/$CARCH/module"
-	install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
-	sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/host.install"
-	
-	# compress each module individually
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *
 
-	# systemd module loading
-	install -Dm644 /dev/null "$pkgdir/usr/lib/modules-load.d/virtualbox-host-modules-ck.conf"
-	printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" >  \
-		"$pkgdir/usr/lib/modules-load.d/virtualbox-host-modules-ck.conf"
+  # compress each module individually
+  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+	
+  # systemd module loading
+  printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/virtualbox-host-modules-ck.conf"
 }
 
 package_virtualbox-ck-guest-modules() {
@@ -55,21 +51,19 @@ package_virtualbox-ck-guest-modules() {
 	pkgdesc='Guest kernel modules for VirtualBox running under Linux-ck.'
 	license=('GPL')
 	provides=("VIRTUALBOX-GUEST-MODULES")
-	depends=('linux-ck>=4.13' 'linux-ck<4.14')
+	depends=('linux-ck>=4.14' 'linux-ck<4.15')
 	#replaces=('virtualbox-ck-guest-modules-corex')
 	#groups=('ck-generic')
-	install=guest.install
 
-	install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
 	cd "dkms/vboxguest/${pkgver}_OSE/$_kernver/$CARCH/module"
-	install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
-	sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/guest.install"
-	
-	# compress each module individually
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *
 
-	# systemd module loading
-  install -Dm644 /dev/null "$pkgdir/usr/lib/modules-load.d/virtualbox-guest-modules-ck.conf"
-  printf "vboxguest\nvboxsf\nvboxvideo\n" >  \
-		"$pkgdir/usr/lib/modules-load.d/virtualbox-guest-modules-ck.conf"
+  # compress each module individually
+  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+
+  # systemd module loading
+  printf "vboxguest\nvboxsf\nvboxvideo\n" |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/virtualbox-guest-modules-ck.conf"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/guest.install b/guest.install
deleted file mode 100644
index 4175a008b69d..000000000000
--- a/guest.install
+++ /dev/null
@@ -1,21 +0,0 @@
-_depmod() {
-	EXTRAMODULES='extramodules-4.13-ck'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-	cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-	_depmod
-}
-
-post_upgrade() {
-	_depmod
-}
-
-post_remove() {
-	_depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/host.install b/host.install
deleted file mode 100644
index 6e149c561ff9..000000000000
--- a/host.install
+++ /dev/null
@@ -1,23 +0,0 @@
-_depmod() {
-	EXTRAMODULES='extramodules-4.13-ck'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-	cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-	_depmod
-}
-
-post_upgrade() {
-	_depmod
-	echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-	_depmod
-}
-
-# vim:set ts=2 sw=2 et: