[arch-commits] Commit in virtualbox-modules-arch/trunk (2 files)

[Jan Steffens]

    Date: Sunday, November 19, 2017 @ 00:08:00
  Author: heftig
Revision: 267376

5.2.0-6

Modified:
  virtualbox-modules-arch/trunk/PKGBUILD
Deleted:
  virtualbox-modules-arch/trunk/virtualbox-modules-arch.install

---------------------------------+
 PKGBUILD                        |   31 ++++++++++++-------------------
 virtualbox-modules-arch.install |   23 -----------------------
 2 files changed, 12 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-19 00:04:21 UTC (rev 267375)
+++ PKGBUILD	2017-11-19 00:08:00 UTC (rev 267376)
@@ -5,10 +5,9 @@
 pkgbase=virtualbox-modules-arch
 pkgname=('virtualbox-host-modules-arch' 'virtualbox-guest-modules-arch')
 pkgver=5.2.0
-pkgrel=5
-# remember to also adjust the .install file!
+pkgrel=6
 _linux_major=4
-_linux_minor=13
+_linux_minor=14
 arch=('x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -30,19 +29,16 @@
   conflicts=('virtualbox-modules' 'virtualbox-host-modules'
 			 'virtualbox-host-dkms')
   provides=('VIRTUALBOX-HOST-MODULES')
-  install=virtualbox-modules-arch.install
 
   cd "/var/lib/dkms/vboxhost/${pkgver}_OSE/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *
 
-  # compress earch modules individually
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+  # compress each module individually
+  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
 
   # systemd module loading
-  install -Dm644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-  printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" >  \
-    "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+  printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 }
 
 package_virtualbox-guest-modules-arch(){
@@ -55,19 +51,16 @@
   conflicts=('virtualbox-archlinux-modules' 'virtualbox-guest-modules'
              'virtualbox-guest-dkms')
   provides=('VIRTUALBOX-GUEST-MODULES')
-  install=virtualbox-modules-arch.install
 
   cd "/var/lib/dkms/vboxguest/${pkgver}_OSE/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *
 
-  # compress earch modules individually
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+  # compress each module individually
+  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
 
   # systemd module loading
-  install -Dm644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-  printf "vboxguest\nvboxsf\nvboxvideo\n" >  \
-    "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+  printf "vboxguest\nvboxsf\nvboxvideo\n" |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: virtualbox-modules-arch.install
===================================================================
--- virtualbox-modules-arch.install	2017-11-19 00:04:21 UTC (rev 267375)
+++ virtualbox-modules-arch.install	2017-11-19 00:08:00 UTC (rev 267376)
@@ -1,23 +0,0 @@
-_depmod() {
-  EXTRAMODULES=extramodules-4.13-ARCH
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-==> Virtualbox kernel modules will be loaded at boot time by systemd-modules-load.
-==> In order to use them right now, you may want to load them manually.
-==> Read modules-load.d man page to disable module boot loading.'
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et: