diff options
| -rwxr-xr-x | libre/virtualbox-libre/PKGBUILD | 108 | ||||
| -rwxr-xr-x | libre/virtualbox-libre/vboxdrv-reference.patch | 8 | ||||
| -rwxr-xr-x | libre/virtualbox-libre/virtualbox-libre-guest-additions.install (renamed from libre/virtualbox-libre/virtualbox-libre-parabola-additions.install) | 0 | ||||
| -rwxr-xr-x | libre/virtualbox-libre/virtualbox-libre-guest-source.install (renamed from libre/virtualbox-libre/virtualbox-libre-parabola-source.install) | 0 | ||||
| -rwxr-xr-x | libre/virtualbox-libre/virtualbox-libre-host-source.install (renamed from libre/virtualbox-libre/virtualbox-libre-source.install) | 0 |
5 files changed, 60 insertions, 56 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index ceff911bc..74df9b34c 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,26 +1,28 @@ # $Id$ # Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + pkgbase=virtualbox-libre pkgname=('virtualbox-libre' - 'virtualbox-libre-parabola-additions' 'virtualbox-libre-sdk' - 'virtualbox-libre-source' - 'virtualbox-libre-parabola-source') -pkgver=4.1.22 -pkgrel=1.3 + 'virtualbox-libre-host-source' + 'virtualbox-libre-guest-additions' + 'virtualbox-libre-guest-source') +pkgver=4.2.0 +pkgrel=1 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' -'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2') +'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2' 'cdrkit') #'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk ipv6_vnc.patch + 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk change_default_driver_dir.patch vboxservice.conf vboxservice.rc vboxservice.service vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png os_dragora_64.png os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png os_gnu_64.png @@ -60,11 +62,14 @@ build() { cp "$srcdir/LocalConfig.kmk" . + # fake makeself binary to compile without nofatal + ln -s /bin/echo makeself + export PATH="$CWD:$PATH" + ./configure --disable-docs \ --enable-webservice \ --enable-vde \ --enable-vnc \ - --nofatal \ --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all @@ -77,11 +82,11 @@ build() { package_virtualbox-libre() { pkgdesc="Powerful x86 virtualization for enterprise as well as home use (without non-free distros and others OS presets for the VM creation wizard; Oracle VM VirtualBox Extension Pack support removed)" - depends=('virtualbox-libre-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng') + depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng') optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: developer kit' - 'virtualbox-libre-source: host kernel libre source modules for non-stock kernels' + 'virtualbox-libre-host-source: host kernel libre source modules for non-stock kernels' 'net-tools: for host-only or bridged networking') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') @@ -160,24 +165,8 @@ package_virtualbox-libre() { } -package_virtualbox-libre-source() { - pkgdesc="VirtualBox kernel libre modules source" - depends=(dkms gcc make) - replaces=('virtualbox-source') - conflicts=('virtualbox-source') - provides=("virtualbox-source=$pkgver" 'virtualbox-libre-modules') - optdepends=('linux-libre-headers' - 'linux-libre-lts-headers') - install=virtualbox-libre-source.install - - install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver" - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source" -} - package_virtualbox-libre-sdk() { - pkgdesc="VirtualBox Software Developer Kit (SDK)" + pkgdesc='VirtualBox Software Developer Kit (SDK)' depends=('python2') replaces=('virtualbox-sdk') conflicts=('virtualbox-sdk') @@ -197,14 +186,46 @@ package_virtualbox-libre-sdk() { mv sdk "$pkgdir/usr/lib/virtualbox" } -package_virtualbox-libre-parabola-additions(){ +package_virtualbox-libre-host-source() { + pkgdesc='VirtualBox kernel libre modules source' + depends=(dkms gcc make) + provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules') + replaces=('virtualbox-host-source' 'virtualbox-source') + conflicts=('virtualbox-host-source' 'virtualbox-source') + optdepends=('linux-libre-headers' + 'linux-libre-lts-headers') + install=virtualbox-libre-host-source.install + + install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source" +} + +package_virtualbox-libre-guest-source() { + pkgdesc='VirtualBox Additions kernel libre modules source' + depends=(dkms gcc make) + provides=("virtualbox-guest-source=${pkgver}" 'virtualbox-libre-guest-modules') + replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source') + conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source') + optdepends=('linux-libre-headers' + 'linux-libre-lts-headers') + install=virtualbox-libre-guest-source.install + + install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source" +} + +package_virtualbox-libre-guest-additions(){ pkgdesc="Additions only for Parabola guests (userspace tools)" - depends=('virtualbox-libre-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') - conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') - provides=("virtualbox-archlinux-additions=${pkgver}") + depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') + provides=("virtualbox-guest-additions=${pkgver}") + replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions') + conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions') backup=('etc/conf.d/vboxservice') - install=virtualbox-libre-parabola-additions.install + install=virtualbox-libre-guest-additions.install source "VirtualBox-$pkgver/env.sh" @@ -236,27 +257,10 @@ package_virtualbox-libre-parabola-additions(){ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } -package_virtualbox-libre-parabola-source() { - pkgdesc='VirtualBox Additions kernel libre modules source' - depends=(dkms gcc make) - replaces=('virtualbox-archlinux-source') - conflicts=('virtualbox-archlinux-source') - provides=("virtualbox-archlinux-source=${pkgver}" 'virtualbox-libre-parabola-modules') - optdepends=('linux-libre-headers' - 'linux-libre-lts-headers') - install=virtualbox-libre-parabola-source.install - - install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver" - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source" -} - -md5sums=('84c5beeead094ce52d098105897aadbb' +md5sums=('691b4134983ce7d89b9fb683305cb647' '5f85710e0b8606de967716ded7b2d351' - 'bf5d1eeeec20a042e8af34cd61a9e11b' + 'aa0c090e33aab3e2853b679cc52cba2a' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' - '4ff559f2bea335d59c4012048983ca91' '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' '7d9823507206de9b8528a72af2f18d74' diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index 9599a3a49..4703da68d 100755 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -21,8 +21,8 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - "recompiles the vboxdrv kernel module if necessary." + "libre module by executing<br/><br/>" + " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-source and " -+ "execute dkms install vboxhost/4.1.18 ." ++ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " ++ "execute dkms autoinstall ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -42,7 +42,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - "OSE version and the PUEL version of VirtualBox." + "The VirtualBox kernel libre modules do not match this version of " + "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> " -+ " <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>" ++ " <font color=blue>'dkms autoinstall'</font><br/><br/>" ); QString g_QStrHintOtherNoDriver = QApplication::tr( @@ -85,7 +85,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- + if you don't use our stock kernel libre compile the modules with - sudo /etc/init.d/vboxdrv setup -+ sudo dkms install vboxhost/4.1.18 ++ sudo dkms autoinstall You will not be able to start VMs until this problem is fixed. EOF diff --git a/libre/virtualbox-libre/virtualbox-libre-parabola-additions.install b/libre/virtualbox-libre/virtualbox-libre-guest-additions.install index 38bbe807d..38bbe807d 100755 --- a/libre/virtualbox-libre/virtualbox-libre-parabola-additions.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-additions.install diff --git a/libre/virtualbox-libre/virtualbox-libre-parabola-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install index 966fb5681..966fb5681 100755 --- a/libre/virtualbox-libre/virtualbox-libre-parabola-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-source.install diff --git a/libre/virtualbox-libre/virtualbox-libre-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install index 6a3994c8d..6a3994c8d 100755 --- a/libre/virtualbox-libre/virtualbox-libre-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-host-source.install |