aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Allen <bensallen@me.com>2016-12-31 06:02:25 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2017-01-02 14:44:29 +0000
commit9184bc5530c168712d77f468cc77ae5e3f0649dd (patch)
treea0056b1f17e1537e884abfcb1cd62f2c8cab1530
parent2277b0dcd277f5f8cfecc66b709b555f3a61a4b0 (diff)
downloadaports-9184bc5530c168712d77f468cc77ae5e3f0649dd.tar.bz2
aports-9184bc5530c168712d77f468cc77ae5e3f0649dd.tar.xz
testing/virtualbox-guest-modules-grsec: Fix build for virtgrsec kernel.
Requires linux-virtgrsec-dev-4.4.39-r4 or newer to compile.
-rw-r--r--testing/virtualbox-guest-modules-grsec/APKBUILD9
1 files changed, 5 insertions, 4 deletions
diff --git a/testing/virtualbox-guest-modules-grsec/APKBUILD b/testing/virtualbox-guest-modules-grsec/APKBUILD
index df63a2742f..ab643a0cab 100644
--- a/testing/virtualbox-guest-modules-grsec/APKBUILD
+++ b/testing/virtualbox-guest-modules-grsec/APKBUILD
@@ -8,7 +8,7 @@ _kpkgrel=4
# when chaning _ver we *must* bump _mypkgrel
_ver=5.1.12
-_mypkgrel=1
+_mypkgrel=2
_name=virtualbox-guest-modules
# verify the kernel version before entering chroot
@@ -31,7 +31,7 @@ pkgdesc="VirtualBox Additions kernel modules for $_flavor "
arch='x86 x86_64'
url='http://virtualbox.org'
license="GPL custom"
-makedepends="linux-grsec-dev=$_kpkgver sed coreutils"
+makedepends="linux-grsec-dev=$_kpkgver linux-virtgrsec-dev=$_kpkgver sed coreutils"
subpackages="$_name-virtgrsec:_virtgrsec"
source="http://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2
"
@@ -41,7 +41,6 @@ prepare() {
local i
cd "$builddir"
$builddir/src/VBox/Additions/linux/export_modules "$builddir/vbox-kmod.tar.gz"
- tar -xf "$builddir/vbox-kmod.tar.gz"
for i in $_abi_release $_abi_release_virtgrsec; do
mkdir -p "$srcdir/$i"
tar -C "$srcdir/$i" -zxf "$builddir"/vbox-kmod.tar.gz
@@ -53,7 +52,7 @@ build() {
for i in $_abi_release $_abi_release_virtgrsec; do
cd "$srcdir/$i"
# Build Kernel Modules
- make KERN_DIR=/lib/modules/${_abi_release}/build \
+ make KERN_DIR=/lib/modules/${i}/build \
|| return 1
done
}
@@ -72,6 +71,8 @@ package() {
_virtgrsec() {
pkgdesc="VirtualBox Additions kernel modules for virtgrsec"
mkdir -p "$subpkgdir"/lib/modules/
+ # vboxvideo.ko won't load with virtgrsec kernel as it doesn't have DRM
+ rm "$pkgdir"/lib/modules/$_abi_release_virtgrsec/misc/vboxvideo.ko
mv "$pkgdir"/lib/modules/$_abi_release_virtgrsec \
"$subpkgdir"/lib/modules/
}