diff options
3 files changed, 51 insertions, 10 deletions
diff --git a/community/virtualbox-guest-additions/APKBUILD b/community/virtualbox-guest-additions/APKBUILD index 436cb09b3dc..099b1cbb937 100644 --- a/community/virtualbox-guest-additions/APKBUILD +++ b/community/virtualbox-guest-additions/APKBUILD @@ -6,16 +6,16 @@ _flavor=${FLAVOR:-grsec} pkgname=virtualbox-guest-additions pkgver=5.1.12 -pkgrel=0 +pkgrel=1 pkgdesc="VirtualBox Addtions userland components" -arch='x86_64' +arch='x86 x86_64' url='http://virtualbox.org' license="GPL custom" install="$pkgname.pre-install" -makedepends="sed kbuild lvm2-dev yasm zlib-dev libressl-dev curl-dev" +makedepends="sed kbuild lvm2-dev yasm nasm zlib-dev libressl-dev curl-dev" depends="virtualbox-guest-modules-$_flavor" source="http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2 - futimens.patch + futimens.patch musl-fix-headers.patch musl-no-glibc.patch musl-fix-stat-nsec.patch @@ -68,28 +68,28 @@ md5sums="58fd51b90358ac42811e044988d53438 VirtualBox-5.1.12.tar.bz2 81a2ebe27e166219a03858f87eb57518 musl-fix-headers.patch 2d8119cc2bb88a1dc8e1bcd2a6abf36e musl-no-glibc.patch 9b6a45f250956232f33911ea26d1355e musl-fix-stat-nsec.patch -5de14e453e1e7c92afdd73ef60bd4fe9 musl-sched_yield.patch +782043d5e8be8809590cea641d232ea1 musl-sched_yield.patch 072ee2114b3771e7bdbff5211f342755 uclibc-gnu_linux.patch b5e6069e20db86cb2e00f1431b202ca4 vboxguestlib-makefile-nox11.patch -8a6525395f4791b8261f245be1eec552 virtualbox-guest-additions-localconfig +430264b0faa43af365e444fd7989dddf virtualbox-guest-additions-localconfig c4fea5734564528cd7f9cc5d73c71aa2 virtualbox-guest-additions.initd" sha256sums="e6f10b1b6f3eb1be2c5223f60569f8ce35468a4354ed53db12f4c9b419393d0d VirtualBox-5.1.12.tar.bz2 deaa739129ec23a05d5aa43ad8af3e93086ca340696fde3e5d1539e1c7347adb futimens.patch d5085e8921b5fa7dca26d2a8da6d1174f7971491c356b6bea5126e6dda0d863c musl-fix-headers.patch d0bc2e84675741a54b42b59c9746f255799264512b11a565ce3d435f1398a874 musl-no-glibc.patch aab58b5dd854551c52063876e8b4186892ba0b3cf9d907c3abe9cff93b8be7fc musl-fix-stat-nsec.patch -5f478eee88c170b502f5d73181e282e8f4306b1609243bbe152642e3410a641f musl-sched_yield.patch +981264f4925eb73a48cbcade54b80cae6797e039c7b95cfcb1f6076a30750adb musl-sched_yield.patch 1bf547f849bf325e443f74ce7fbfb3657d9b2918b4c888efac304eac929a0fae uclibc-gnu_linux.patch 19d156225f205245abeca94aac72b90d6dec2d830b4fb30b6c6ce790011e97ac vboxguestlib-makefile-nox11.patch -555a92cc4741419f7ffd6b9698600b85dc14ddfc6fed6df792d13caf7116e2af virtualbox-guest-additions-localconfig +fbbb5d68a2b5d05673e4343caad49fe4858445ec601722cb0a9f0fffe539307a virtualbox-guest-additions-localconfig 9f163a04d5e829a314c084ba00e01038fba697a360c21e0c6c611918ce869273 virtualbox-guest-additions.initd" sha512sums="0e63f778595aada4389a0d4f390aaa56fc1fb0ed0c4ce999f060787ce6d29462329d6543f34572111d2538cf49a54b799263fe04ebd115c2426506c28c809516 VirtualBox-5.1.12.tar.bz2 1da850bc30399ecde501eba5403ef1add1ae108d38394b01cd7f5cdf0462b855793d564d3adc1f770983b36529d77f3f7b0269fb65152468084a0a44c38e1638 futimens.patch 0169a620d62aa3de8124e0084f4b747b602fbdcab7892fe075606459e0200d412321c86da4c5d98309f4d7479ae1b5267ed28bea6c6e64fd8be88cab74f8e94c musl-fix-headers.patch b1c47cb910ac751df7bd4bc10c5501e91d88a9b3e4fe181b02755d433df8e89a160a38422912266f0cc51ba0c09854dad513ba6f2634fc76c59cee7989b259eb musl-no-glibc.patch 2c329085915f0ffa43828a14d8b29d0d876e48e18a0190ad146cd0731af7eca11cdf41d2e533c9cc73aa75506b9b91e3a08f2272cd8884e0d929722730b99862 musl-fix-stat-nsec.patch -ddeca1cf8dd7d749e3c649b7861d3b12d246882dc0fbd2a980efc2c5a33dac94c5b40b07a49d26cd3ea1bb9917ce0485abc4ee8ff3e6291534433263a54050d4 musl-sched_yield.patch +56c5c3a0becd8f1886010f5f231aa1d2e129bf188f8220e111fb9d51c191a429940edec700f5286b46dadbb45b62e67ee4e09fec6bcea61a344fb65afcbd6756 musl-sched_yield.patch d2bba9de80c40bc258b025a8e3395a4b0b7781d70d5528993f0fff57e9fc015306b483d4da14e22aed3f188ffda8685aa51e13943f48c17ae18a2a66d15d7bbb uclibc-gnu_linux.patch 0ced8df03a354e211fd0631d3971246d75de3a60c2347b5fe33236405d55911422d53eb7c679ae6fc18dc8f57c245d5701fa02ae740d1f0bd1e1cbb0b715bf2f vboxguestlib-makefile-nox11.patch -1b14e0239e91d2d1515250272eb485b442d785dac98bdd7b1cca2fad123f853fe138b6cfad2566c8cb35cab3b77151a49a9422fbad3c13489fa12f3f43d550b9 virtualbox-guest-additions-localconfig +43555e442f85424c957d51a737394c6f2ec0782e5b8701e3bc6a08d17ae2e8e6e9e85734d69853f7151f91f951a9a921c4f0c5d5f6b72e8379526c49f070d49b virtualbox-guest-additions-localconfig a2325a3bdc2655a0d245c674400bbb44ecbce159044176fc2faa7b959986d39a327d4dfcbf1d1b815459c157087fb75650b525344f561cd44edb071c29263f2d virtualbox-guest-additions.initd" diff --git a/community/virtualbox-guest-additions/musl-sched_yield.patch b/community/virtualbox-guest-additions/musl-sched_yield.patch index b3012e5c1a1..19680e539df 100644 --- a/community/virtualbox-guest-additions/musl-sched_yield.patch +++ b/community/virtualbox-guest-additions/musl-sched_yield.patch @@ -30,3 +30,42 @@ #endif #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) u64TS = ASMReadTSC() - u64TS; +diff --git a/src/VBox/Runtime/r3/posix/semevent-posix.cpp b/src/VBox/Runtime/r3/posix/semevent-posix.cpp +index 80d5747..4f70841 100644 +--- a/src/VBox/Runtime/r3/posix/semevent-posix.cpp ++++ b/src/VBox/Runtime/r3/posix/semevent-posix.cpp +@@ -44,15 +44,7 @@ + #include <pthread.h> + #include <unistd.h> + #include <sys/time.h> +- +-#ifdef RT_OS_DARWIN +-# define pthread_yield() pthread_yield_np() +-#endif +- +-#if defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD) +-# include <sched.h> +-# define pthread_yield() sched_yield() +-#endif ++#include <sched.h> + + + /********************************************************************************************************************************* +@@ -317,7 +309,7 @@ DECL_FORCE_INLINE(int) rtSemEventWait(RTSEMEVENT hEventSem, RTMSINTERVAL cMillie + /* for fairness, yield before going to sleep. */ + if ( ASMAtomicIncU32(&pThis->cWaiters) > 1 + && pThis->u32State == EVENT_STATE_SIGNALED) +- pthread_yield(); ++ sched_yield(); + + /* take mutex */ + int rc = pthread_mutex_lock(&pThis->Mutex); +@@ -405,7 +397,7 @@ DECL_FORCE_INLINE(int) rtSemEventWait(RTSEMEVENT hEventSem, RTMSINTERVAL cMillie + + /* for fairness, yield before going to sleep. */ + if (ASMAtomicIncU32(&pThis->cWaiters) > 1 && cMillies) +- pthread_yield(); ++ sched_yield(); + + /* take mutex */ + int rc = pthread_mutex_lock(&pThis->Mutex); diff --git a/community/virtualbox-guest-additions/virtualbox-guest-additions-localconfig b/community/virtualbox-guest-additions/virtualbox-guest-additions-localconfig index bcc79725280..b7a0df804f8 100644 --- a/community/virtualbox-guest-additions/virtualbox-guest-additions-localconfig +++ b/community/virtualbox-guest-additions/virtualbox-guest-additions-localconfig @@ -35,3 +35,5 @@ VBOX_WITH_X11_ADDITIONS := WITH_X11 := VBOX_WITH_DRAG_AND_DROP := VBOX_WITH_PAM := + +TOOL_YASM_AS := yasm |