[arch-commits] Commit in virtualbox/trunk (7 files)
Sébastien Luttringer
seblu at archlinux.org
Sun Mar 13 21:21:28 UTC 2016
Date: Sunday, March 13, 2016 @ 22:21:28
Author: seblu
Revision: 166559
upgpkg: virtualbox 5.0.16-3
- put sheebang to bash because of bashish in *.install files
- display a notification about the change of loading modules use systemd-modules-load
- fix description in vboxreload
- do not depends on linux-headers
- fix FS#48566
- add vboxvideo modules for guest
- fix modules loading ordering
- update patching snippet to last version
- fix optdeps kernels description
Added:
virtualbox/trunk/virtualbox-guest-dkms.install
virtualbox/trunk/virtualbox-host-dkms.install
Modified:
virtualbox/trunk/PKGBUILD
virtualbox/trunk/vboxreload
virtualbox/trunk/virtualbox-ext-vnc.install
virtualbox/trunk/virtualbox-guest-utils.install
virtualbox/trunk/virtualbox.install
--------------------------------+
PKGBUILD | 38 +++++++++++++++++++++-----------------
vboxreload | 2 +-
virtualbox-ext-vnc.install | 2 +-
virtualbox-guest-dkms.install | 12 ++++++++++++
virtualbox-guest-utils.install | 2 +-
virtualbox-host-dkms.install | 12 ++++++++++++
virtualbox.install | 2 +-
7 files changed, 49 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-03-13 18:55:52 UTC (rev 166558)
+++ PKGBUILD 2016-03-13 21:21:28 UTC (rev 166559)
@@ -11,7 +11,7 @@
'virtualbox-guest-utils-nox'
'virtualbox-ext-vnc')
pkgver=5.0.16
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -75,7 +75,7 @@
'8ba9179c4a3516904417d773816dd992'
'fcf6bcef98b16849d5c9f048592739c0'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
- 'fd3d988c83d33add042544fa9a281923'
+ '0bab94ff2f4835fd907f89eb23ebbe21'
'9be7e2703afeee1fca9368bd8750e710'
'9e49bbaa2192b141c27ee43cef8cbab7'
'ecfd13297d7753ebe7b8763ca5b792d9'
@@ -86,11 +86,13 @@
prepare() {
cd "VirtualBox-$pkgver"
- for _f in "${source[@]}"; do
- [[ "$_f" =~ \.patch$ ]] && {
- msg2 "Applying patch $_f"
- patch -p1 -N -i "$srcdir/$_f"
- }
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
done
msg2 'Applying local config'
@@ -246,7 +248,7 @@
package_virtualbox-host-dkms() {
pkgdesc='VirtualBox Host kernel modules sources'
- depends=('dkms' 'gcc' 'make' 'linux-headers')
+ depends=('dkms' 'gcc' 'make')
replaces=('virtualbox-source'
'virtualbox-host-source'
'virtualbox-host-modules'
@@ -253,9 +255,10 @@
'virtualbox-host-modules-lts')
conflicts=('virtualbox-source' 'virtualbox-host-source')
optdepends=('linux-headers: build modules against Arch kernel'
- 'linux-lts-headers: build modules against LTS Arch kernel'
- 'linux-zen-headers: build modules against ZEN Arch kernel'
- 'linux-grsec-headers: build modules against GRSEC Arch kernel')
+ 'linux-lts-headers: build modules against LTS kernel'
+ 'linux-zen-headers: build modules against ZEN kernel'
+ 'linux-grsec-headers: build modules against GRSEC kernel')
+ install=virtualbox-host-dkms.install
install -dm755 "$pkgdir/usr/src"
source "VirtualBox-$pkgver/env.sh"
@@ -267,13 +270,13 @@
# module loading
install -Dm644 /dev/null \
"$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- printf "vboxnetadp\nvboxnetflt\nvboxdrv\n" > \
+ printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > \
"$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
}
package_virtualbox-guest-dkms() {
pkgdesc='VirtualBox Guest kernel modules sources'
- depends=('dkms' 'gcc' 'make' 'linux-headers')
+ depends=('dkms' 'gcc' 'make')
replaces=('virtualbox-archlinux-source'
'virtualbox-guest-source'
'virtualbox-guest-modules'
@@ -280,9 +283,10 @@
'virtualbox-guest-modules-lts')
conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source')
optdepends=('linux-headers: build modules against Arch kernel'
- 'linux-lts-headers: build modules against LTS Arch kernel'
- 'linux-zen-headers: build modules against ZEN Arch kernel'
- 'linux-grsec-headers: build modules against GRSEC Arch kernel')
+ 'linux-lts-headers: build modules against LTS kernel'
+ 'linux-zen-headers: build modules against ZEN kernel'
+ 'linux-grsec-headers: build modules against GRSEC kernel')
+ install=virtualbox-guest-dkms.install
install -dm755 "$pkgdir/usr/src"
source "VirtualBox-$pkgver/env.sh"
@@ -294,7 +298,7 @@
# module loading
install -Dm644 /dev/null \
"$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
- printf "vboxnetadp\nvboxsf\nvboxguest\n" > \
+ printf "vboxguest\nvboxsf\nvboxvideo\n" > \
"$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
}
Modified: vboxreload
===================================================================
--- vboxreload 2016-03-13 18:55:52 UTC (rev 166558)
+++ vboxreload 2016-03-13 21:21:28 UTC (rev 166559)
@@ -1,6 +1,6 @@
#!/bin/bash
-# vboxreload: shortcut to reload virtualbox modules with DKMS support
+# vboxreload: shortcut to reload virtualbox host modules
#
# Copyright © 2016 Sébastien Luttringer
#
Modified: virtualbox-ext-vnc.install
===================================================================
--- virtualbox-ext-vnc.install 2016-03-13 18:55:52 UTC (rev 166558)
+++ virtualbox-ext-vnc.install 2016-03-13 21:21:28 UTC (rev 166559)
@@ -1,4 +1,4 @@
-#/bin/sh
+#/bin/bash
# arg 1: the new package version
post_install() {
Added: virtualbox-guest-dkms.install
===================================================================
--- virtualbox-guest-dkms.install (rev 0)
+++ virtualbox-guest-dkms.install 2016-03-13 21:21:28 UTC (rev 166559)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( $(vercmp $2 5.0.16-3) < 0 )); then
+ echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by systemd-modules-load.'
+ echo '==> Read modules-load.d man page to disable them.'
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Modified: virtualbox-guest-utils.install
===================================================================
--- virtualbox-guest-utils.install 2016-03-13 18:55:52 UTC (rev 166558)
+++ virtualbox-guest-utils.install 2016-03-13 21:21:28 UTC (rev 166559)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# arg 1: the new package version
post_install() {
Added: virtualbox-host-dkms.install
===================================================================
--- virtualbox-host-dkms.install (rev 0)
+++ virtualbox-host-dkms.install 2016-03-13 21:21:28 UTC (rev 166559)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if (( $(vercmp $2 5.0.16-3) < 0 )); then
+ echo '==> Since version 5.0.16-2 kernel modules are loaded at boot by systemd-modules-load.'
+ echo '==> Read modules-load.d man page to disable them.'
+ fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Modified: virtualbox.install
===================================================================
--- virtualbox.install 2016-03-13 18:55:52 UTC (rev 166558)
+++ virtualbox.install 2016-03-13 21:21:28 UTC (rev 166559)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
utils() {
if [ -x usr/bin/update-mime-database ]; then
More information about the arch-commits
mailing list