diff --git a/files/0001-fixes-for-32-bit-build-with-kernel-4.18.patch b/files/0001-fixes-for-32-bit-build-with-kernel-4.18.patch deleted file mode 100644 --- a/files/0001-fixes-for-32-bit-build-with-kernel-4.18.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- VirtualBox-5.2.12.orig/src/VBox/Additions/linux/sharedfolders/utils.c -+++ VirtualBox-5.2.12/src/VBox/Additions/linux/sharedfolders/utils.c -@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIM - RTTimeSpecSetNano(ts, t); - } - #else /* >= 2.6.0 */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0) -+static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts) -+#else - static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts) -+#endif - { - int64_t t = RTTimeSpecGetNano(ts); - int64_t nsec; -@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struc - tv->tv_nsec = nsec; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0) -+static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv) -+#else - static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv) -+#endif - { - int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000; - RTTimeSpecSetNano(ts, t); diff --git a/files/series b/files/series --- a/files/series +++ b/files/series @@ -1,4 +1,3 @@ 010-qt-5.11.patch gcc8.patch -0001-fixes-for-32-bit-build-with-kernel-4.18.patch 012-vboxsf-automount.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : virtualbox -version : 5.2.18 -release : 76 +version : 5.2.20 +release : 77 source : - - https://download.virtualbox.org/virtualbox/5.2.18/VirtualBox-5.2.18.tar.bz2 : ed0a7efd56c7f39fae79c7ec3321473da412ef0d7914457b66f42679d513efcf - - git|https://github.com/jwrdegoede/vboxsf.git : 9451f61e6787e95aa51e42b6381db6b059bc49da + - https://download.virtualbox.org/virtualbox/5.2.20/VirtualBox-5.2.20.tar.bz2 : cc61986cec72a1e2ce10b8c82f5d837d46e33aeb49ff4e8abbe02bb597785540 + - git|https://github.com/jwrdegoede/vboxsf.git : 0e8d9459e500d2a465c0074db6f7f8fdad6de1a7 license : GPL-2.0-only component : - virt @@ -136,12 +136,10 @@ ##### guest modules ##### cd additions - for kern in "%kernel_version_lts%" "%kernel_version_current%"; do - cp -a src ${kern} - pushd ${kern} - %make KERN_VER=${kern} - popd - done + cp -a src "%kernel_version_lts%" + pushd "%kernel_version_lts%" + %make all KERN_VER=%kernel_version_lts% + popd install : | ##### Host ##### cd out/linux.amd64/release/bin diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ virtualbox - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net GPL-2.0-only virt @@ -19,7 +19,7 @@ virt - virtualbox-common + virtualbox-common /lib/modules/4.9.133-111.lts/extra/vboxdrv.ko @@ -332,7 +332,7 @@ virt - virtualbox-common + virtualbox-common /lib/modules/4.18.14-95.current/extra/vboxdrv.ko @@ -348,8 +348,8 @@ programming.devel - virtualbox - virtualbox-common + virtualbox + virtualbox-common /usr/lib/python2.7/site-packages/vboxapi-1.0-py2.7.egg-info @@ -799,7 +799,7 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/4.9.133-111.lts/misc/vboxguest.ko @@ -842,19 +842,19 @@ virt - virtualbox-guest-common + virtualbox-guest-common /lib/modules/4.18.14-95.current/misc/vboxsf.ko - - 2018-10-13 - 5.2.18 + + 2018-10-17 + 5.2.20 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file