Bump to 5.2.2

4 files changed, 22 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 130980c497e8..e92ef3460cae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 pkgbase = virtualbox-modules-uksm
-	pkgver = 5.2.0
+	pkgver = 5.2.2
 	pkgrel = 1
 	url = http://virtualbox.org
 	arch = x86_64
 	license = GPL
 	makedepends = linux-uksm-headers
-	makedepends = virtualbox-host-dkms>=5.2.0
-	makedepends = virtualbox-guest-dkms>=5.2.0
+	makedepends = virtualbox-host-dkms>=5.2.2
+	makedepends = virtualbox-guest-dkms>=5.2.2
 	makedepends = dkms
 
 pkgname = virtualbox-host-modules-uksm
 	pkgdesc = Host kernel modules for VirtualBox running under Linux-uksm.
-	install = host.install
 	license = GPL
 	depends = linux-uksm>=4.13
 	depends = linux-uksm<4.14
+	provides = VIRTUALBOX-HOST-MODULES
 
 pkgname = virtualbox-guest-modules-uksm
 	pkgdesc = Guest kernel modules for VirtualBox running under Linux-uksm.
-	install = guest.install
 	license = GPL
 	depends = linux-uksm>=4.13
 	depends = linux-uksm<4.14
+	provides = VIRTUALBOX-GUEST-MODULES
 
diff --git a/PKGBUILD b/PKGBUILD
index 9712107649c9..b463db6c7e46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=virtualbox-modules-uksm
 pkgname=('virtualbox-host-modules-uksm' 'virtualbox-guest-modules-uksm')
-pkgver=5.2.0
+pkgver=5.2.2
 pkgrel=1
 arch=('x86_64')
 url='http://virtualbox.org'
@@ -30,39 +30,33 @@ build() {
 package_virtualbox-host-modules-uksm() {
 	pkgdesc='Host kernel modules for VirtualBox running under Linux-uksm.'
 	license=('GPL')
+	provides=("VIRTUALBOX-HOST-MODULES")
 	depends=('linux-uksm>=4.13' 'linux-uksm<4.14')
-	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-uksm.conf"
-	printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" >  \
-		"$pkgdir/usr/lib/modules-load.d/virtualbox-host-modules-uksm.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-lqx.conf"
 }
 
 package_virtualbox-guest-modules-uksm() {
 	pkgdesc='Guest kernel modules for VirtualBox running under Linux-uksm.'
 	license=('GPL')
+	provides=("VIRTUALBOX-GUEST-MODULES")
 	depends=('linux-uksm>=4.13' 'linux-uksm<4.14')
-	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 *
+
+        # compress each module individually
+        find "$pkgdir" -name '*.ko' -exec gzip -n {} +
 
-	# systemd module loading
-        install -Dm644 /dev/null "$pkgdir/usr/lib/modules-load.d/virtualbox-guest-modules-uksm.conf"
-        printf "vboxguest\nvboxsf\nvboxvideo\n" >  \
-		"$pkgdir/usr/lib/modules-load.d/virtualbox-guest-modules-uksm.conf"
+        # systemd module loading
+        printf "vboxguest\nvboxsf\nvboxvideo\n" |
+        install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/virtualbox-guest-modules-uksm.conf"
 }
diff --git a/guest.install b/guest.install
deleted file mode 100644
index 866ff8e23a4d..000000000000
--- a/guest.install
+++ /dev/null
@@ -1,19 +0,0 @@
-_depmod() {
-	EXTRAMODULES='extramodules-4.13-uksm'
-	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
-}
diff --git a/host.install b/host.install
deleted file mode 100644
index dfbc2f7171cf..000000000000
--- a/host.install
+++ /dev/null
@@ -1,21 +0,0 @@
-_depmod() {
-	EXTRAMODULES='extramodules-4.13-uksm'
-	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
-}