diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-12 09:29:39 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-12 10:01:10 +0000 |
| commit | 2a4c8cfdbc4f953584e54e10ea6f16434ad04463 (patch) | |
| tree | bebd95f56116b7c6c191893fc7444d6653a02939 /community | |
| parent | 6f134ca0109b13c9cee6b518b30d03cac40d1221 (diff) | |
community/virtualbox-guest-modules-vanilla: upgrade to 6.0.8/4.19.50
add install_if for virtualbox-guest-additions
Diffstat (limited to 'community')
| -rw-r--r-- | community/virtualbox-guest-modules-vanilla/APKBUILD | 13 | ||||
| -rw-r--r-- | community/virtualbox-guest-modules-vanilla/vboxguest-log-use-c99.patch | 13 |
2 files changed, 6 insertions, 20 deletions
diff --git a/community/virtualbox-guest-modules-vanilla/APKBUILD b/community/virtualbox-guest-modules-vanilla/APKBUILD index 70d065cbfe8..2a918b01549 100644 --- a/community/virtualbox-guest-modules-vanilla/APKBUILD +++ b/community/virtualbox-guest-modules-vanilla/APKBUILD @@ -3,12 +3,12 @@ # when chaning _ver we *must* bump _rel _name=virtualbox-guest-modules -_ver=6.0.4 +_ver=6.0.8 _rel=0 _flavor=${FLAVOR:-vanilla} _kpkg=linux-$_flavor -_kver=4.19.49 +_kver=4.19.50 _krel=0 _kpkgver="$_kver-r$_krel" @@ -20,15 +20,14 @@ pkgver=$_kver pkgrel=$(($_krel + $_rel)) pkgdesc="VirtualBox Additions guest kernel modules for $_flavor" -arch='x86 x86_64' +arch='x86_64' # seems to fail on x86: https://github.com/alpinelinux/aports/pull/8215#issuecomment-496630776 url='https://virtualbox.org/' license="GPL-2.0 custom" makedepends="linux-vanilla-dev=$_kpkgver linux-virt-dev=$_kpkgver sed coreutils" subpackages="$_name-virt:virt" source="https://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2 - vboxguest-log-use-c99.patch " -#provides="${_name}-grsec=${pkgver}-r${pkgrel}" +install_if="linux-$_flavor=$_kpkgver virtualbox-guest-additions" builddir="$srcdir"/VirtualBox-$_ver prepare() { @@ -86,6 +85,7 @@ package() { virt() { pkgdesc="VirtualBox Additions kernel modules for virt" + install_if="linux-virt=$_kpkgver virtualbox-guest-additions" mkdir -p "$subpkgdir"/lib/modules/ # vboxvideo.ko won't load with virt kernel as it doesn't have DRM rm "$pkgdir"/lib/modules/$_kabi_virt/misc/vboxvideo.ko @@ -93,5 +93,4 @@ virt() { "$subpkgdir"/lib/modules/ } -sha512sums="c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb VirtualBox-6.0.4.tar.bz2 -bd934e9ed3d2324ef66e2539d2f3f6fab35a8858d670bba817b9cabfe66e85fe13a8594b35f4a8e639841f72fb0b8d12af38518ba25638da5ef338b259ab600b vboxguest-log-use-c99.patch" +sha512sums="df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf5640957b1d411333f5bd5be3f03f382550f1afaecf0651d847bc88c95863d83 VirtualBox-6.0.8.tar.bz2" diff --git a/community/virtualbox-guest-modules-vanilla/vboxguest-log-use-c99.patch b/community/virtualbox-guest-modules-vanilla/vboxguest-log-use-c99.patch deleted file mode 100644 index d8af408b8a3..00000000000 --- a/community/virtualbox-guest-modules-vanilla/vboxguest-log-use-c99.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/VBox/Additions/common/VBoxGuest/linux/Makefile b/src/VBox/Additions/common/VBoxGuest/linux/Makefile -index b403647..cd58fcb 100644 ---- a/src/VBox/Additions/common/VBoxGuest/linux/Makefile -+++ b/src/VBox/Additions/common/VBoxGuest/linux/Makefile -@@ -108,7 +108,7 @@ endif - - 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 |