From 97d53fc90e090a5ff87a33690245b528511a60aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 26 Dec 2012 13:42:33 -0200 Subject: virtualbox-libre-4.2.6-1: updating version --- libre/virtualbox-libre/001-vboxdrv-reference.patch | 79 ++++------------------ libre/virtualbox-libre/PKGBUILD | 69 ++++++++++++------- libre/virtualbox-libre/virtualbox-libre.install | 4 +- 3 files changed, 60 insertions(+), 92 deletions(-) (limited to 'libre/virtualbox-libre') diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch index 51fd6361c..b75c3c565 100644 --- a/libre/virtualbox-libre/001-vboxdrv-reference.patch +++ b/libre/virtualbox-libre/001-vboxdrv-reference.patch @@ -1,88 +1,44 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -67,38 +67,34 @@ - - /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */ - QString g_QStrHintLinuxNoMemory = QApplication::tr( -- "This error means that the kernel driver was either not able to " -+ "This error means that the kernel libre driver was either not able to " - "allocate enough memory or that some mapping operation failed." - ); - - QString g_QStrHintLinuxNoDriver = QApplication::tr( -- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " -+ "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or " +@@ -75,10 +75,9 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " -- "module by executing

" + "module by executing

" - " '/etc/init.d/vboxdrv setup'

" - "as root. If it is available in your distribution, you should install the " - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." -+ "libre module by executing

" + " 'pacman -S virtualbox-libre-host-modules'

" -+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " ++ "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and " + "execute dkms autoinstall ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " -+ "The VirtualBox kernel libre modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Please try completely uninstalling and reinstalling " - "VirtualBox." - ); +@@ -90,11 +89,8 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " + "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing

" - " '/etc/init.d/vboxdrv setup'

" - "may correct this. Make sure that you do not mix the " - "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

" ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute

" + " 'dkms autoinstall'

" ); QString g_QStrHintOtherNoDriver = QApplication::tr( -- "Make sure the kernel module has been loaded successfully." -+ "Make sure the kernel libre module has been loaded successfully." - ); - - /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ -@@ -590,7 +586,7 @@ - case VERR_VM_DRIVER_NOT_INSTALLED: - case VERR_VM_DRIVER_LOAD_ERROR: - msgText += QApplication::tr ( -- "Cannot access the kernel driver!

"); -+ "Cannot access the kernel libre driver!

"); - # ifdef RT_OS_LINUX - msgText += g_QStrHintLinuxNoDriver; - # else -@@ -603,7 +599,7 @@ - break; - # endif - case VERR_VM_DRIVER_NOT_ACCESSIBLE: -- msgText += QApplication::tr ("Kernel driver not accessible"); -+ msgText += QApplication::tr ("Kernel libre driver not accessible"); - break; - case VERR_VM_DRIVER_VERSION_MISMATCH: - # ifdef RT_OS_LINUX diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 -@@ -30,19 +30,20 @@ - SHUTDOWN="true" - elif ! lsmod|grep -q vboxdrv; then +@@ -32,17 +32,18 @@ cat << EOF --WARNING: The vboxdrv kernel module is not loaded. Either there is no module -- available for the current kernel (`uname -r`) or it failed to + 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 -+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module -+ available for the current kernel libre (`uname -r`) or it failed to -+ load. Please reinstall the kernel libre module virtualbox-libre-host-modules or -+ if you don't use our stock kernel libre compile the modules with ++ load. Please reinstall the kernel module virtualbox-libre-host-modules or ++ if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup + sudo dkms autoinstall @@ -99,14 +55,3 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- and if that is not successful, try to re-install the package. -@@ -52,9 +53,8 @@ - - if [ -f /etc/vbox/module_not_compiled ]; then - cat << EOF --WARNING: The compilation of the vboxdrv.ko kernel module failed during the -+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the - installation for some reason. Starting a VM will not be possible. -- Please consult the User Manual for build instructions. - EOF - fi - \ No newline at end of file diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index c7ca35aca..23b7e5069 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -8,18 +8,19 @@ pkgbase=virtualbox-libre pkgname=('virtualbox-libre' + 'virtualbox-libre-host-dkms' + 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' - 'virtualbox-libre-host-source' 'virtualbox-libre-guest-utils' - 'virtualbox-libre-guest-source') -pkgver=4.2.4 -pkgrel=2 + 'virtualbox-libre-ext-vnc') +pkgver=4.2.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('alsa-lib' 'bin86' - 'cdrkit-libre' + 'cdrkit' 'curl' 'dev86' 'gsoap' @@ -41,7 +42,7 @@ makedepends=('alsa-lib' 'glu' 'python2' 'qt' - 'sdl-libre' + 'sdl' 'sdl_ttf' 'vde2' 'xalan-c') @@ -78,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_venenux.png' 'libre.patch' 'free-distros.patch') -md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' +md5sums=('d680aeb3b4379b8281527aeb012b2df5' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' @@ -88,7 +89,7 @@ md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33' '7e9483b1069a54f181546083ac7e5469' 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' - '4f1692638d6740df4c4ad9766ba4e179' + 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' @@ -154,31 +155,39 @@ build() { --disable-kmods source ./env.sh kmk all + + # fix python2 sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" + # build rdesktop-vrdp (broken from LocalConfig.kmk) - cd src/VBox/RDP/client + pushd src/VBox/RDP/client cp "$srcdir/LocalConfig.kmk" . # fix keymap path FS#32548 sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk kmk all + popd + + # build VNC pack + pushd src/VBox/ExtPacks/VNC + kmk packing + popd } package_virtualbox-libre() { pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)' depends=('curl' 'libpng' - 'libvncserver' 'libxcursor' 'libxinerama' 'libxml2' 'libxmu' - 'sdl-libre' + 'sdl' 'shared-mime-info' 'virtualbox-libre-host-modules') optdepends=('qt: VirtualBox GUI support' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: Developer kit' - 'virtualbox-libre-host-source: Host kernel libre source modules for non-stock kernels' + 'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels' 'net-tools: Host-only or bridged networking support') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') replaces=('virtualbox' 'virtualbox-ose') @@ -277,12 +286,12 @@ package_virtualbox-libre-sdk() { mv sdk "$pkgdir/usr/lib/virtualbox" } -package_virtualbox-libre-host-source() { - pkgdesc='VirtualBox Host kernel libre modules source (DKMS)' +package_virtualbox-libre-host-dkms() { + pkgdesc='VirtualBox Host kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules') - replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') - conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') + provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules') + replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') + conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-host-source.install @@ -293,12 +302,12 @@ package_virtualbox-libre-host-source() { cp -r src "$pkgdir/usr/src/vboxhost-$pkgver" } -package_virtualbox-libre-guest-source() { - pkgdesc='VirtualBox Guest kernel libre modules source (DKMS)' +package_virtualbox-libre-guest-dkms() { + pkgdesc='VirtualBox Guest kernel modules sources' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-guest-source=$pkgver" 'virtualbox-libre-guest-modules') - replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') - conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') + provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules') + replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') + conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source') optdepends=('linux-libre-headers' 'linux-libre-lts-headers') install=virtualbox-libre-guest-source.install @@ -312,7 +321,7 @@ package_virtualbox-libre-guest-source() { package_virtualbox-libre-guest-utils(){ pkgdesc='VirtualBox Guest userspace utilities' depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels') + optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels') provides=("virtualbox-guest-utils=$pkgver") replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') @@ -347,4 +356,18 @@ package_virtualbox-libre-guest-utils(){ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } +package_virtualbox-libre-ext-vnc() { + pkgdesc='VirtualBox VNC extension pack' + depends=('virtualbox-libre' 'libvncserver') + optdepends=('tigervnc: vnc client') + replaces=('virtualbox-ext-vnc') + conflicts=('virtualbox-ext-vnc') + provides=("virtualbox-ext-vnc=$pkgver") + install=virtualbox-ext-vnc.install + + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" + install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" +} + # vim:set ts=4 sw=4 et: diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index b6d804eb7..3d93b47a3 100755 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -30,8 +30,8 @@ post_upgrade() { post_install "$1" if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then cat << EOF -===> Starting with virtualbox-libre version 4.1.6-1, kernel libre modules handling is done by virtualbox-libre-modules. -===> Use virtualbox-libre-source package if you don't use our stock linux-libre package. +===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-modules. +===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package. EOF fi } -- cgit v1.2.3-2-g168b