diff options
| author | root <root@rshg054.dnsready.net> | 2011-11-08 23:14:49 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-11-08 23:14:49 +0000 |
| commit | ddba9670c1518d9b420db6a6dca01a4a4a4136c7 (patch) | |
| tree | 8b5ba5ea49ecb6848eba27d2eb609100de5e760a /community-testing/virtualbox | |
| parent | effb26c3b1f00bf8bea4e2562f07f9a06eb67606 (diff) | |
Tue Nov 8 23:14:49 UTC 2011
Diffstat (limited to 'community-testing/virtualbox')
| -rw-r--r-- | community-testing/virtualbox/PKGBUILD | 19 | ||||
| -rwxr-xr-x | community-testing/virtualbox/vbox-service.rc | 4 | ||||
| -rw-r--r-- | community-testing/virtualbox/vboxdrv-reference.patch | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD index cebea94bf..d03459176 100644 --- a/community-testing/virtualbox/PKGBUILD +++ b/community-testing/virtualbox/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 57944 2011-11-04 18:30:05Z ibiru $ +# $Id: PKGBUILD 58173 2011-11-07 22:10:19Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') pkgver=4.1.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt=4.7.4-3' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' 'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2') #'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') @@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} change_default_driver_dir.patch vbox-service.conf vbox-service.rc) _extramodules=extramodules-3.1-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" +_kernver="$(cat /lib/modules/${_extramodules}/version || true)" build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -112,7 +112,10 @@ package_virtualbox() { package_virtualbox-source() { pkgdesc="VirtualBox kernel modules source" - depends=(linux-headers gcc make) + depends=(gcc make) + provides=(virtualbox-modules) + optdepends=('linux-headers' + 'kernel26-lts-headers') install=virtualbox-source.install source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" @@ -175,12 +178,12 @@ package_virtualbox-archlinux-additions(){ # install sample config install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" } -md5sums=('03cd0875729558a46f910483e1984316' +md5sums=('89b979d1b817242c7cdcb489898f166a' 'af534f713993eb077df26ff9a44fb080' '5f85710e0b8606de967716ded7b2d351' - '88b847c3480df14139980d62597329ec' + '6ab2455c391d8cc005e2f4461ae26a3b' '78ffa67ff131680f1d2b6f06d4325c5b' 'a82d698e7868315cdf876cfb02fd2268' '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' - '778d865e56e31cc592fbfa257fdcfce7') + 'e7416331d0bc331f3b5aae3e5d104642') diff --git a/community-testing/virtualbox/vbox-service.rc b/community-testing/virtualbox/vbox-service.rc index c1af2134d..6f1b8d892 100755 --- a/community-testing/virtualbox/vbox-service.rc +++ b/community-testing/virtualbox/vbox-service.rc @@ -11,13 +11,13 @@ case "$1" in start) stat_busy "Starting $name service" [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ - && { add_daemon $name; stat_done; } \ + && { add_daemon vbox-service; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name service" [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ + && { rm_daemon vbox-service; stat_done; } \ || { stat_fail; exit 1; } ;; restart) diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch index 9f4b127cd..710e2e511 100644 --- a/community-testing/virtualbox/vboxdrv-reference.patch +++ b/community-testing/virtualbox/vboxdrv-reference.patch @@ -37,7 +37,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+ load. Please recompile the kernel module virtualbox-modules or ++ load. Please reinstall the kernel module virtualbox-modules or + if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup |