diff options
4 files changed, 71 insertions, 14 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index ff13b50b9..7dbb749d7 100755 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -91,7 +91,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647' 'c159d683ba1947290fc2ad2c64194150' 'bc9efed88e0469cd7fc460d5a5cd7b4b' '97e193f050574dd272a38e5ee5ebe62b' - 'fdaecf7dd5796c052599e8f2bf48da64' + '4f1692638d6740df4c4ad9766ba4e179' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' 'f6416f509c2e5460e4dc624e0a57f3c1' diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index be650440e..51fd6361c 100644 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -1,44 +1,88 @@ 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 -@@ -75,10 +75,9 @@ - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " +@@ -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 " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing<br/><br/>" +- "module by executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "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." -+ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel, install virtualbox-host-source and" ++ "libre module by executing<br/><br/>" ++ " <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>" ++ "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( -@@ -90,11 +89,8 @@ +- "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." + ); 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<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." -+ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " ++ "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 autoinstall'</font><br/><br/>" ); 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 ( +- "<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 -+ load. Please reinstall the kernel module virtualbox-modules or -+ if you don't use our stock kernel compile the modules with ++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 - sudo /etc/init.d/vboxdrv setup + sudo dkms autoinstall @@ -55,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-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install index 966fb5681..2d62eae43 100755 --- a/libre/virtualbox-libre/virtualbox-libre-guest-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-guest-source.install @@ -2,6 +2,7 @@ # arg 1: the new package version post_install() { + dkms add vboxguest/${1%-*} cat << EOF ==> To build and install your modules run dkms install vboxguest/${1%-*} ==> To do this automatically at startup you can add dkms in your DAEMONS diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install index 6a3994c8d..8028cb7e0 100755 --- a/libre/virtualbox-libre/virtualbox-libre-host-source.install +++ b/libre/virtualbox-libre/virtualbox-libre-host-source.install @@ -2,6 +2,7 @@ # arg 1: the new package version post_install() { + dkms add vboxhost/${1%-*} cat << EOF ==> To build and install your modules run dkms install vboxhost/${1%-*} ==> To do this automatically at startup you can add dkms in your DAEMONS |