summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre-modules
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-26 16:51:37 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-07-26 16:51:37 -0300
commitab51af689e5e94d8929f8389f1b50a4d03359dd9 (patch)
tree8a098e901ed27dbdf63706ce319b56a65eee0c30 /libre/virtualbox-libre-modules
parenta68664d6ff8471e44f261904dae73d4200e092b1 (diff)
downloadabslibre-ab51af689e5e94d8929f8389f1b50a4d03359dd9.tar.gz
abslibre-ab51af689e5e94d8929f8389f1b50a4d03359dd9.tar.bz2
abslibre-ab51af689e5e94d8929f8389f1b50a4d03359dd9.zip
virtualbox-libre-modules: fixing issues and updating free-distros.patch
Diffstat (limited to 'libre/virtualbox-libre-modules')
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD7
-rw-r--r--libre/virtualbox-libre-modules/free-distros.patch24
2 files changed, 28 insertions, 3 deletions
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index a43ae0d87..ef63d7ff0 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules')
pkgver=4.1.18
-pkgrel=5
+pkgrel=5.1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -44,7 +44,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'a9e4724b56ddf99bb2e9a8fab8ad43ba'
- 'bff9fb57834202fb715a4f138f945cb6')
+ 'f7d275fc52e5f3cfafd85646c2914063')
_extramodules=extramodules-3.5-LIBRE
_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
@@ -56,6 +56,7 @@ build() {
cd "$srcdir/VirtualBox-${pkgver}"
patch -Np1 -i "$srcdir/libre.patch"
+ patch -Np1 -i "$srcdir/free-distros.patch"
## Removing Nonfree directories
rm -rv "./include/VBox/ExtPack"
@@ -113,7 +114,7 @@ package_virtualbox-libre-parabola-modules(){
for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
install -D -m644 ${module} \
- "$pkgdir/lib/modules/${_extramodules}/${module}"
+ "$pkgdir/usr/lib/modules/${_extramodules}/${module}"
done
install -D -m 0644 "$srcdir/60-vboxguest.rules" \
diff --git a/libre/virtualbox-libre-modules/free-distros.patch b/libre/virtualbox-libre-modules/free-distros.patch
index 64c876512..7920fb6ab 100644
--- a/libre/virtualbox-libre-modules/free-distros.patch
+++ b/libre/virtualbox-libre-modules/free-distros.patch
@@ -1357,3 +1357,27 @@
};
+--- VirtualBox-4.1.18.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-06-20 10:09:01.000000000 -0300
++++ VirtualBox-4.1.18/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2012-07-26 15:32:55.309812685 -0300
+@@ -622,16 +622,16 @@
+ * Call the common device extension initializer.
+ */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_X86)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_AMD64)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_X86)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_AMD64)
+- VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24_x64;
++ VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
+ #else
+ # warning "huh? which arch + version is this?"
+- VBOXOSTYPE enmOsType = VBOXOSTYPE_Linux;
++ VBOXOSTYPE enmOsType = VBOXOSTYPE_GNULinux;
+ #endif
+ rc = VBoxGuestInitDevExt(&g_DevExt,
+ g_IOPortBase,