summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/virtualbox-libre')
-rw-r--r--libre/virtualbox-libre/PKGBUILD4
-rw-r--r--libre/virtualbox-libre/vboxbuild10
-rw-r--r--libre/virtualbox-libre/vboxdrv-reference.patch46
-rw-r--r--libre/virtualbox-libre/virtualbox-libre.install4
4 files changed, 49 insertions, 15 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 79c0d0b02..8e239915d 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-source'
'virtualbox-libre-parabola-source')
pkgver=4.1.18
-pkgrel=5.2
+pkgrel=5.4
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -257,7 +257,7 @@ package_virtualbox-libre-parabola-source() {
md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'5f85710e0b8606de967716ded7b2d351'
- '7e14fbec3aa6904b1015ae82b5a7b097'
+ 'bf5d1eeeec20a042e8af34cd61a9e11b'
'a1ff1d1b4423556887e48a32978226a6'
'4ff559f2bea335d59c4012048983ca91'
'97e193f050574dd272a38e5ee5ebe62b'
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index 350d0c6ad..27519950f 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -35,7 +35,7 @@ if [[ -f /proc/modules ]]; then
fi
if (( ${#MODLIST[*]} )); then
- stat_busy "Unloading VirtualBox kernel modules"
+ stat_busy "Unloading VirtualBox kernel libre modules"
modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
fi
@@ -44,7 +44,7 @@ for kdir in /usr/lib/modules/[2-3]*; do
# found a stale kernel
mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
if (( ${#mods[@]} )); then
- stat_busy "Removing all old VirtualBox kernel modules"
+ stat_busy "Removing all old VirtualBox kernel libre modules"
if rm -f "${mods[@]}" &&
rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
stat_done
@@ -64,12 +64,12 @@ for kernver; do
export KERN_DIR=/usr/lib/modules/$kernver/build
export MODULE_DIR=/usr/lib/modules/$kernver/extramodules
if [[ ! -d $KERN_DIR ]]; then
- printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
+ printf "error: \`%s' does not appear to be a valid kernel libre build directory.\n" \
"$KERN_DIR"
continue
fi
- stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
+ stat_busy "Recompiling VirtualBox kernel libre modules ($kernver)"
if ! $BUILDVBOXDRV \
--save-module-symvers /tmp/vboxdrv-Module.symvers \
--no-print-directory install >> $LOG 2>&1; then
@@ -90,6 +90,6 @@ for kernver; do
done
if (( ${#MODLIST[*]} )); then
- stat_busy "Reloading VirtualBox kernel modules"
+ stat_busy "Reloading VirtualBox kernel libre modules"
modprobe -a "${MODLIST[@]}" && stat_done || stat_fail
fi
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 6991a49d7..9599a3a49 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -1,6 +1,7 @@
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(
@@ -20,7 +21,7 @@ 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, install virtualbox-libre-source and "
++ "as root. If you don't use our stock kernel libre, install virtualbox-libre-source and "
+ "execute dkms install vboxhost/4.1.18 ."
);
@@ -40,7 +41,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
- "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 execute<br/><br/> "
++ "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/>"
);
@@ -50,16 +51,38 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
);
/* 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 (
+- "<b>Cannot access the kernel driver!</b><br/><br/>");
++ "<b>Cannot access the kernel libre driver!</b><br/><br/>");
+ # 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
-@@ -32,17 +32,18 @@
+@@ -30,19 +30,20 @@
+ SHUTDOWN="true"
+ elif ! lsmod|grep -q vboxdrv; then
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-modules or
-+ if you don't use our stock kernel compile the modules with
++ 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
@@ -76,3 +99,14 @@ 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/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 6913fe2ed..b6d804eb7 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 version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
+===> 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.
EOF
fi
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-23 02:31:43 +0000