[arch-commits] Commit in (6 files)
Sébastien Luttringer
seblu at archlinux.org
Sun Apr 17 22:59:34 UTC 2016
Date: Monday, April 18, 2016 @ 00:59:34
Author: seblu
Revision: 171275
Virtualbox binary modules for linux-arch kernel
Added:
virtualbox-modules-arch/
virtualbox-modules-arch/trunk/virtualbox-modules-arch.install
(from rev 171216, virtualbox-modules/trunk/virtualbox-guest-modules.install)
Modified:
virtualbox-modules-arch/trunk/PKGBUILD
Deleted:
virtualbox-modules-arch/trunk/virtualbox-guest-modules.install
virtualbox-modules-arch/trunk/virtualbox-host-modules.install
virtualbox-modules/
---------------------------------------------------------------+
trunk/PKGBUILD | 75 +++++-----
trunk/virtualbox-guest-modules.install | 21 --
trunk/virtualbox-host-modules.install | 23 ---
virtualbox-modules-arch/trunk/virtualbox-modules-arch.install | 23 +++
4 files changed, 63 insertions(+), 79 deletions(-)
Modified: virtualbox-modules-arch/trunk/PKGBUILD
===================================================================
--- virtualbox-modules/trunk/PKGBUILD 2016-04-17 22:30:33 UTC (rev 171274)
+++ virtualbox-modules-arch/trunk/PKGBUILD 2016-04-17 22:59:34 UTC (rev 171275)
@@ -1,62 +1,67 @@
# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
# Maintainer: Sébastien Luttringer
+# Contributor: Ionut Biru <ibiru at archlinux.org>
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=5.0.14
-pkgrel=4
+pkgbase=virtualbox-modules-arch
+pkgname=('virtualbox-host-modules-arch' 'virtualbox-guest-modules-arch')
+pkgver=5.0.16
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
-makedepends=('linux>=4.4' 'linux<4.5'
- 'linux-headers>=4.4' 'linux-headers<4.5'
+makedepends=('linux>=4.5' 'linux<4.6'
+ 'linux-headers>=4.5' 'linux-headers<4.6'
"virtualbox-host-dkms>=$pkgver"
"virtualbox-guest-dkms>=$pkgver")
# remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-4.4-ARCH
+_extramodules=extramodules-4.5-ARCH
-build() {
+package_virtualbox-host-modules-arch(){
_kernver="$(cat /usr/lib/modules/$_extramodules/version)"
- # dkms need modification to be run as user
- cp -r /var/lib/dkms .
- echo "dkms_tree='$srcdir/dkms'" > dkms.conf
- # build host modules
- msg2 'Host modules'
- dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
- # build guest modules
- msg2 'Guest modules'
- dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
+ pkgdesc='Virtualbox host kernel modules for Arch Kernel'
+ depends=('linux>=4.5' 'linux<4.6')
+ replaces=('virtualbox-modules' 'virtualbox-host-modules')
+ conflicts=('virtualbox-modules' 'virtualbox-host-modules'
+ 'virtualbox-host-dkms')
+ provides=('VIRTUALBOX-HOST-MODULES')
+ install=virtualbox-modules-arch.install
-package_virtualbox-host-modules(){
- _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
- pkgdesc='Host kernel modules for VirtualBox'
- depends=('linux>=4.4' 'linux<4.5')
- replaces=('virtualbox-modules')
- conflicts=('virtualbox-modules')
- install=virtualbox-host-modules.install
-
- cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
+ cd "/var/lib/dkms/vboxhost/${pkgver}_OSE/$_kernver/$CARCH/module"
install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+
+ # compress earch modules individually
find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ # 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"
}
-package_virtualbox-guest-modules(){
+package_virtualbox-guest-modules-arch(){
_kernver="$(cat /usr/lib/modules/$_extramodules/version)"
- pkgdesc='Guest kernel modules for VirtualBox'
+ pkgdesc='Virtualbox guest kernel modules for Arch Kernel'
license=('GPL')
- depends=('linux>=4.4' 'linux<4.5')
- replaces=('virtualbox-archlinux-modules')
- conflicts=('virtualbox-archlinux-modules')
- install=virtualbox-guest-modules.install
+ depends=('linux>=4.5' 'linux<4.6')
+ replaces=('virtualbox-archlinux-modules' 'virtualbox-guest-modules')
+ conflicts=('virtualbox-archlinux-modules' 'virtualbox-guest-modules'
+ 'virtualbox-guest-dkms')
+ provides=('VIRTUALBOX-GUEST-MODULES')
+ install=virtualbox-modules-arch.install
- cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
+ cd "/var/lib/dkms/vboxguest/${pkgver}_OSE/$_kernver/$CARCH/module"
install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+
+ # compress earch modules individually
find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ # 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"
}
# vim:set ts=2 sw=2 et:
Deleted: virtualbox-modules-arch/trunk/virtualbox-guest-modules.install
===================================================================
--- virtualbox-modules/trunk/virtualbox-guest-modules.install 2016-04-17 22:30:33 UTC (rev 171274)
+++ virtualbox-modules-arch/trunk/virtualbox-guest-modules.install 2016-04-17 22:59:34 UTC (rev 171275)
@@ -1,21 +0,0 @@
-_depmod() {
- EXTRAMODULES=extramodules-4.4-ARCH
- 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:
Deleted: virtualbox-modules-arch/trunk/virtualbox-host-modules.install
===================================================================
--- virtualbox-modules/trunk/virtualbox-host-modules.install 2016-04-17 22:30:33 UTC (rev 171274)
+++ virtualbox-modules-arch/trunk/virtualbox-host-modules.install 2016-04-17 22:59:34 UTC (rev 171275)
@@ -1,23 +0,0 @@
-_depmod() {
- EXTRAMODULES=extramodules-4.4-ARCH
- 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:
Copied: virtualbox-modules-arch/trunk/virtualbox-modules-arch.install (from rev 171216, virtualbox-modules/trunk/virtualbox-guest-modules.install)
===================================================================
--- virtualbox-modules-arch/trunk/virtualbox-modules-arch.install (rev 0)
+++ virtualbox-modules-arch/trunk/virtualbox-modules-arch.install 2016-04-17 22:59:34 UTC (rev 171275)
@@ -0,0 +1,23 @@
+_depmod() {
+ EXTRAMODULES=extramodules-4.5-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:
More information about the arch-commits
mailing list