diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-15 08:54:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-08-15 16:30:06 +0000 |
| commit | ee4ffbb28c8a78a28e0315d7050f8837fa316dc5 (patch) | |
| tree | a5c57489337acd03e297dfc8e764fd9a6cefa6ef /testing/virtualbox-guest-modules-grsec | |
| parent | 2cbc7ef008c41f4791ffc847c0d26e6a8364ee49 (diff) | |
| download | aports-ee4ffbb28c8a78a28e0315d7050f8837fa316dc5.tar.bz2 aports-ee4ffbb28c8a78a28e0315d7050f8837fa316dc5.tar.xz | |
testing/virtualbox-guest-modules-grsec: upgrade to 5.1.2
and add virtgrsec package
Diffstat (limited to 'testing/virtualbox-guest-modules-grsec')
| -rw-r--r-- | testing/virtualbox-guest-modules-grsec/10-vboxguest-Makefile.patch | 11 | ||||
| -rw-r--r-- | testing/virtualbox-guest-modules-grsec/APKBUILD | 64 |
2 files changed, 37 insertions, 38 deletions
diff --git a/testing/virtualbox-guest-modules-grsec/10-vboxguest-Makefile.patch b/testing/virtualbox-guest-modules-grsec/10-vboxguest-Makefile.patch deleted file mode 100644 index 2e1b591175..0000000000 --- a/testing/virtualbox-guest-modules-grsec/10-vboxguest-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- VirtualBox-5.0.12/vboxguest/Makefile.orig -+++ VirtualBox-5.0.12/vboxguest/Makefile -@@ -108,7 +108,7 @@ - - MOD_DEFS = -DVBOX -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_GUEST \ - -DIN_GUEST_R0 -DIN_MODULE -DRT_WITH_VBOX -DVBGL_VBOXGUEST \ -- -DVBOX_WITH_HGCM -+ -DVBOX_WITH_HGCM -DLOG_USE_C99 - ifeq ($(BUILD_TARGET_ARCH),amd64) - MOD_DEFS += -DRT_ARCH_AMD64 - else diff --git a/testing/virtualbox-guest-modules-grsec/APKBUILD b/testing/virtualbox-guest-modules-grsec/APKBUILD index cf8165606b..fc09b054a1 100644 --- a/testing/virtualbox-guest-modules-grsec/APKBUILD +++ b/testing/virtualbox-guest-modules-grsec/APKBUILD @@ -7,8 +7,8 @@ _kver=4.4.17 _kpkgrel=0 # when chaning _ver we *must* bump _mypkgrel -_ver=5.0.20 -_mypkgrel=0 +_ver=5.1.2 +_mypkgrel=1 _name=virtualbox-guest-modules # verify the kernel version before entering chroot @@ -22,6 +22,7 @@ fi _kpkgver="$_kver-r$_kpkgrel" _abi_release=${_kver}-${_kpkgrel}-${_flavor} +_abi_release_virtgrsec=${_kver}-${_kpkgrel}-virtgrsec pkgname=${_name}-${_flavor} pkgver=$_kver @@ -30,42 +31,51 @@ pkgdesc="VirtualBox Additions kernel modules for $_flavor " arch='x86 x86_64' url='http://virtualbox.org' license="GPL custom" -makedepends="linux-grsec-dev=$_kpkgver sed" +makedepends="linux-grsec-dev=$_kpkgver sed coreutils" +subpackages="$_name-virtgrsec:_virtgrsec" source="http://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2 - 10-vboxguest-Makefile.patch" - -_builddir="$srcdir"/VirtualBox-$_ver +" +builddir="$srcdir"/VirtualBox-$_ver prepare() { - cd "$_builddir" - $_builddir/src/VBox/Additions/linux/export_modules "$_builddir/vbox-kmod.tar.gz" - tar -xf "$_builddir/vbox-kmod.tar.gz" local i - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac + 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 done } build() { - cd "$_builddir" - # Build Kernel Modules - make KERN_DIR=/lib/modules/${_abi_release}/build KCFLAGS="-fno-pie" + local i + for i in $_abi_release $_abi_release_virtgrsec; do + cd "$srcdir/$i" + # Build Kernel Modules + make KERN_DIR=/lib/modules/${_abi_release}/build \ + KCFLAGS="-fno-pie" || return 1 + done } package() { - cd "$_builddir" - local module= - for module in *.ko; do - install -v -D -m644 ${module} \ - "$pkgdir/lib/modules/${_abi_release}/misc/${module}" + local i module= + for i in $_abi_release $_abi_release_virtgrsec; do + cd "$srcdir/$i" + for module in *.ko; do + install -v -D -m644 ${module} \ + "$pkgdir/lib/modules/$i/misc/${module}" + done done } -md5sums="2054e12c21cac025916df4162f18efd7 VirtualBox-5.0.20.tar.bz2 -34c8e3cb497d86be4281dcd62b3b3b4f 10-vboxguest-Makefile.patch" -sha256sums="af9c0787aae22964a1192cefbf9aa91a40c1d41e5fea485adebf09ab922d4c2b VirtualBox-5.0.20.tar.bz2 -440a4c15e7de4ad9087fedc64c045c6a28f31c59c787ad7a8a34ea65b72f8499 10-vboxguest-Makefile.patch" -sha512sums="a039455eed3715b9aa42e2dc6b65ea68b27899c0bcf0065a93c53d1093cce56ebf8a6982cd804208ef9e51794eab9c5c4f3b20550d41532fd4addbd7afda0f8e VirtualBox-5.0.20.tar.bz2 -38f774b8b2242687dc6327bd4c2fc6951207758fb2e25dd46550861c09a3f2b8efad1a8414529146fbbb8a89cf2eb3ad44b00fbdbbeafd3f8c69ba4cb91decf0 10-vboxguest-Makefile.patch" +_virtgrsec() { + pkgdesc="VirtualBox Additions kernel modules for virtgrsec" + mkdir -p "$subpkgdir"/lib/modules/ + mv "$pkgdir"/lib/modules/$_abi_release_virtgrsec \ + "$subpkgdir"/lib/modules/ +} + +md5sums="aff1647170dd92914cddfbd0254b9773 VirtualBox-5.1.2.tar.bz2" +sha256sums="03c92e3000d4b905d5b18a6abed757998125a37e5efa7864e62eae2baeabe010 VirtualBox-5.1.2.tar.bz2" +sha512sums="99919f2a8c5625ecd1cda766396cc9302fe81585bb15243d969b6a6bdd8f89cd029c5696e0160ca6c965bf43edb7f9ead6608304f20467fd0a6980a25ae84e68 VirtualBox-5.1.2.tar.bz2" |