From 4b9819d98573d82cec1b07beb719390f5fa4aed1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Dec 2012 01:22:37 -0800 Subject: Thu Dec 27 01:22:36 PST 2012 --- libre/cdfs-libre/PKGBUILD | 4 +- libre/linux-libre-api-headers/PKGBUILD | 14 ++-- libre/linux-libre-firmware/PKGBUILD | 9 ++- libre/linux-libre-kmod-alx/PKGBUILD | 10 +-- libre/linux-libre-tools/PKGBUILD | 12 ++-- libre/linux-libre/PKGBUILD | 2 +- libre/linux-libre/linux-libre.install | 2 +- libre/lirc-libre/PKGBUILD | 4 +- libre/tp_smapi-libre-lts/PKGBUILD | 6 +- libre/tp_smapi-libre/PKGBUILD | 4 +- libre/vhba-module-libre/PKGBUILD | 6 +- libre/virtualbox-libre-modules-lts/PKGBUILD | 8 +-- libre/virtualbox-libre-modules-lts/build.sh | 8 +-- libre/virtualbox-libre-modules/PKGBUILD | 13 ++-- libre/virtualbox-libre-modules/build.sh | 8 +-- libre/virtualbox-libre/001-vboxdrv-reference.patch | 79 ++++------------------ libre/virtualbox-libre/PKGBUILD | 69 ++++++++++++------- .../virtualbox-libre-ext-vnc.install | 25 +++++++ libre/virtualbox-libre/virtualbox-libre.install | 4 +- 19 files changed, 139 insertions(+), 148 deletions(-) create mode 100644 libre/virtualbox-libre/virtualbox-libre-ext-vnc.install (limited to 'libre') diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 0b5c20196..7cd18bb6a 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -7,8 +7,8 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 pkgrel=34.1 -pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files. (adapted to linux-libre kernel)" -arch=(i686 x86_64) +pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" +arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" license=('GPL') makedepends=('linux-libre-headers') diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 0f7128226..569568cb1 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165111 2012-08-11 08:21:11Z allan $ +# $Id: PKGBUILD 173859 2012-12-26 01:09:36Z allan $ # Maintainer: Allan McRae # Maintainer (Parabola): André Silva # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -_basekernel=3.6 -_sublevel=3 +_basekernel=3.7 +_sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=1.1 -pkgdesc="Kernel headers sanitized for use in userspace (built from linux-libre source)" +pkgrel=1 +pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') @@ -18,8 +18,8 @@ conflicts=('linux-api-headers') replaces=('linux-api-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") -md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '844bd14e9f58225274e096c31bbb8a8f') +md5sums=('06bf9601d859531e7378eb43d4ca7dd3' + '6f4bb80d3d91b69daf5ccfea836d02df') build() { cd ${srcdir}/linux-${_basekernel} diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index e6461610b..ebdca122c 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -1,11 +1,10 @@ # Maintainer: André Silva # Contributor: Márcio Silva -_pkgname=linux-firmware pkgname=linux-libre-firmware pkgver=3.7 -pkgrel=2 -pkgdesc='Free firmware files for Linux (built from linux-libre source)' +pkgrel=4 +pkgdesc='Free firmware files for Linux-libre' arch=('any') url='http://linux-libre.fsfla.org/' license=('GPL2') @@ -45,6 +44,6 @@ package() { make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install # move WHENCE file to linux-firmware license folder - install -d -m755 $pkgdir/usr/share/licenses/$_pkgname - mv firmware/WHENCE $pkgdir/usr/share/licenses/$_pkgname + install -d -m755 $pkgdir/usr/share/licenses/$pkgname + mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname } diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 64008c7b6..335d35218 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: André Silva _kernver=3.7.1 -_kernrel=1 +_kernrel=2 pkgname=('linux-libre-kmod-alx') -_pkgver=2012-12-04-1-u -pkgver=20121204 +_pkgver=2012-12-19-u +pkgver=20121219 pkgrel=1 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') @@ -16,9 +16,9 @@ install=linux-libre-kmod-alx.install replaces=('alx' 'alx-driver' 'dkms-alx') provides=('alx' 'alx-driver' 'dkms-alx') conflicts=('alx' 'alx-driver' 'dkms-alx') -source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2) +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2) -md5sums=('bc46200e288acb862149a2af11f4b293') +md5sums=('60756fde830487042a525ff17ccfe7ab') build() { diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index fd3c6f8a6..7e988e5dc 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -8,7 +8,7 @@ _basekernel=3.7 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=3 +pkgrel=3.1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -88,7 +88,7 @@ build() { } package_libtraceevent-libre() { - pkgdesc='Linux kernel trace event library (built from linux-libre source)' + pkgdesc='Linux kernel trace event library' depends=('glibc') replaces=('libtraceevent') conflicts=('libtraceevent') @@ -100,7 +100,7 @@ package_libtraceevent-libre() { } package_perf-libre() { - pkgdesc='Linux kernel performance auditing tool (built from linux-libre source)' + pkgdesc='Linux kernel performance auditing tool' depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind') replaces=('perf') conflicts=('perf') @@ -118,7 +118,7 @@ package_perf-libre() { } package_cpupower-libre() { - pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor (built from linux-libre source)' + pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') replaces=('cpupower' 'cpufrequtils') @@ -140,7 +140,7 @@ package_cpupower-libre() { } package_x86_energy_perf_policy-libre() { - pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS (built from linux-libre source)' + pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS' depends=('glibc') replaces=('x86_energy_perf_policy') conflicts=('x86_energy_perf_policy') @@ -152,7 +152,7 @@ package_x86_energy_perf_policy-libre() { } package_usbip-libre() { - pkgdesc='An USB device sharing system over IP network (built from linux-libre source)' + pkgdesc='An USB device sharing system over IP network' depends=('glib2' 'sysfsutils') options=('!libtool') replaces=('usbip') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 90a739e17..8ca135fc2 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel _basekernel=3.7 _sublevel=1 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 +pkgrel=2.1 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 301a1b6c2..61aa977c0 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.7.1-2-LIBRE +KERNEL_VERSION=3.7.1-2.1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index d6bf55f57..7da492643 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -55,7 +55,7 @@ build() { } package_lirc-libre() { - pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (adapted to linux-libre kernel) " + pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package) " depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') @@ -72,7 +72,7 @@ package_lirc-libre() { } package_lirc-utils-libre() { - pkgdesc="Linux Infrared Remote Control utils (adapted to linux-libre kernel)" + pkgdesc="Linux Infrared Remote Control utils" depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index d3228b177..cf38b1882 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,9 +12,9 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9.3 -pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre-lts kernel)" -arch=('i686' 'x86_64') +pkgrel=9.4 +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)" +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 11b515683..d7c900f2a 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -12,8 +12,8 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 pkgrel=12.1 -pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre kernel)" -arch=('i686' 'x86_64') +pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" +arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' license=('GPL') depends=('linux-libre>=3.7' 'linux-libre<3.8') diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index d2c69701b..394379a3c 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -8,9 +8,9 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.7-LIBRE -pkgrel=15 -pkgdesc="Kernel module that emulates SCSI devices (adapted to linux-libre kernel)" -arch=('i686' 'x86_64') +pkgrel=15.1 +pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" +arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL') depends=('linux-libre>=3.7' 'linux-libre<3.8') diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index d836a3a37..0b43cbf0a 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,14 +7,14 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') -pkgver=4.2.4 -pkgrel=1.1 +pkgver=4.2.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-lts-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" 'expac') build() { diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh index 4c3c29e30..d1bfb72ce 100755 --- a/libre/virtualbox-libre-modules-lts/build.sh +++ b/libre/virtualbox-libre-modules-lts/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index b0b6385df..948465a99 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,14 +6,14 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') -pkgver=4.2.4 -pkgrel=3 +pkgver=4.2.6 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-libre-headers' - "virtualbox-libre-host-source>=$pkgver" - "virtualbox-libre-guest-source>=$pkgver" + "virtualbox-libre-host-dkms>=$pkgver" + "virtualbox-libre-guest-dkms>=$pkgver" 'expac') build() { @@ -31,7 +31,7 @@ build() { } package_virtualbox-libre-host-modules(){ - pkgdesc='Host kernel libre modules for VirtualBox' + pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)' depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') @@ -49,7 +49,7 @@ package_virtualbox-libre-host-modules(){ } package_virtualbox-libre-guest-modules(){ - pkgdesc='Guest kernel libre modules for VirtualBox' + pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)' license=('GPL') depends=('linux-libre>=3.7' 'linux-libre<3.8') provides=("virtualbox-guest-modules=${pkgver}") @@ -67,5 +67,4 @@ package_virtualbox-libre-guest-modules(){ sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install" } - # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh index f798a615d..6152ec21d 100755 --- a/libre/virtualbox-libre-modules/build.sh +++ b/libre/virtualbox-libre-modules/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 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..710177923 100644 --- 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-libre-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-ext-vnc.install b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install new file mode 100644 index 000000000..828a16a1d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-ext-vnc.install @@ -0,0 +1,25 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + VBoxManage extpack uninstall 'VNC' >/dev/null +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index b6d804eb7..3d93b47a3 100644 --- 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-54-g00ecf