diff options
author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-07-17 05:19:48 -0300 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-07-17 05:19:48 -0300 |
commit | 0a32dd5aab83123487e6988ec37e7e5385c3aef6 (patch) | |
tree | 760f093c15bf512361439acc7b998f04fdd0cb5b /libre/virtualbox-libre-modules | |
parent | 7d3151cb257dcb2aeacf52bad5d96041677754a2 (diff) | |
parent | 201a3a8a986287b2f54d01e7c5e4bbeba8c37040 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/virtualbox-libre-modules')
3 files changed, 23 insertions, 17 deletions
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index d5a9a62bd..1b0d9c639 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93523 2013-07-05 00:43:32Z seblu $ +# $Id: PKGBUILD 93541 2013-07-05 07:07:43Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -7,12 +7,12 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.16 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux-libre' - 'linux-libre-headers' +makedepends=('linux-libre>=3.10' 'linux-libre<3.11' + 'linux-libre-headers' 'linux-libre-headers<3.11' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" 'expac' @@ -20,7 +20,7 @@ makedepends=('linux-libre' 'bc') # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.9-LIBRE +_extramodules=extramodules-3.10-LIBRE build() { _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') @@ -41,7 +41,7 @@ package_virtualbox-libre-host-modules(){ _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)") - depends=('linux-libre>=3.9' 'linux-libre<3.10') + depends=('linux-libre>=3.10' 'linux-libre<3.11') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -60,7 +60,7 @@ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)") - depends=('linux-libre>=3.9' 'linux-libre<3.10') + depends=('linux-libre>=3.10' 'linux-libre<3.11') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install index d2e34dfc1..eb1707471 100644 --- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install @@ -1,18 +1,21 @@ -VERSION='3.9.7-1-LIBRE' +_depmod() { + EXTRAMODULES='extramodules-3.10-LIBRE' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install index b1d86b9e6..df643c9a6 100644 --- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install @@ -1,20 +1,23 @@ -VERSION='3.9.7-1-LIBRE' +_depmod() { + EXTRAMODULES='extramodules-3.10-LIBRE' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: |