[VirtualBox-kmod] Update to 6.1.0

commit 2b33c770793eb8ddb9fe397c160e8deb873a51b2 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Dec 20 22:28:23 2019 +0000 Update to 6.1.0 .gitignore | 1 + VirtualBox-kmod.spec | 19 +++----- fixes_for_5.4-rc3.patch | 66 ---------------------------- fixes_for_5.4.patch | 114 ------------------------------------------------ kernel-5.patch | 12 ----- sources | 2 +- 6 files changed, 8 insertions(+), 206 deletions(-) --- diff --git a/.gitignore b/.gitignore index cd0efc4..3b61433 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /8dd4b8b.zip /87b9015.zip /83b9657.zip +/5aba938.tar.gz diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 164ac31..0725446 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -11,7 +11,7 @@ # newvboxsf # globals for https://github.com/jwrdegoede/vboxsf/archive/fb360320b7d5c2dc74cb958c9b27... -%global commit1 83b9657878a229c83e4ce652af809bdc18a3a327 +%global commit1 5aba938bcabd978e4615186ad7d8617d633e6f30 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) # Allow only root to access vboxdrv regardless of the file mode @@ -49,15 +49,12 @@ Release: 1%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox -Group: System Environment/Kernel License: GPLv2 or CDDL URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: excludekernel-filter.txt -Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip +Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.tar.gz Patch2: kernel-5.patch -Patch4: fixes_for_5.4.patch -Patch5: fixes_for_5.4-rc3.patch %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time @@ -79,18 +76,15 @@ Kernel module for VirtualBox %prep -%setup -T -c +%setup -T -c -a2 tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} %patch2 -p1 -%patch5 -p1 %if %{with newvboxsf} rm -rf vboxsf/ -unzip %{SOURCE2} -mv vboxsf-%{commit1}/ vboxsf/ +mv ../vboxsf-%{commit1}/ vboxsf/ %endif -%patch4 -p1 popd @@ -115,15 +109,14 @@ for kernel_version in %{?kernel_versions}; do make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules done - # copy vboxdrv (for host) module symbols which are used by vboxpci, vboxnetflt and vboxnetadp km's: + # copy vboxdrv (for host) module symbols which are used by vboxnetflt and vboxnetadp km's: cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetadp} cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetflt} - cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxpci} %if ! %{with newvboxsf} # copy vboxguest (for guest) module symbols which are used by vboxsf km: cp _kmod_build_${kernel_version%%___*}/{vboxguest/Module.symvers,vboxsf} %endif - for module in vbox{netadp,netflt,sf%{?with_vboxvideo:,video},pci}; do + for module in vbox{netadp,netflt,sf%{?with_vboxvideo:,video}}; do make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules done done diff --git a/kernel-5.patch b/kernel-5.patch index 1950911..3bca2e6 100644 --- a/kernel-5.patch +++ b/kernel-5.patch @@ -46,18 +46,6 @@ diff -rup VirtualBox-kmod-6.0.8/vboxnetflt/Makefile-header.gmk VirtualBox-kmod-6 VBOX_KERN_GROKS_SUBDIRS := yes endif endif -diff -rup VirtualBox-kmod-6.0.8/vboxpci/Makefile-header.gmk VirtualBox-kmod-6.0.8.new/vboxpci/Makefile-header.gmk ---- VirtualBox-kmod-6.0.8/vboxpci/Makefile-header.gmk 2019-05-13 14:33:15.000000000 +0100 -+++ VirtualBox-kmod-6.0.8.new/vboxpci/Makefile-header.gmk 2019-05-31 03:03:55.997181820 +0100 -@@ -127,7 +127,7 @@ ifeq ($(KERNELRELEASE),) - VBOX_KERN_GROKS_EXTMOD := - endif - VBOX_KERN_GROKS_SUBDIRS := -- ifeq ($(shell if grep '"[432]\.' $(KERN_DIR)/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes) -+ ifeq ($(shell if grep '"[5432]\.' $(KERN_DIR)/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes) - VBOX_KERN_GROKS_SUBDIRS := yes - endif - endif diff -rup VirtualBox-kmod-6.0.8/vboxsf/Makefile-header.gmk VirtualBox-kmod-6.0.8.new/vboxsf/Makefile-header.gmk --- VirtualBox-kmod-6.0.8/vboxsf/Makefile-header.gmk 2019-05-13 14:33:15.000000000 +0100 +++ VirtualBox-kmod-6.0.8.new/vboxsf/Makefile-header.gmk 2019-05-31 03:03:55.997181820 +0100 diff --git a/sources b/sources index de39784..5e42cfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d069a7c82836301ac4cfa4eac1115cb 83b9657.zip +SHA512 (5aba938.tar.gz) = 15e0decfe463e0fbff5ef61e1cc5af231fbcaf3b64f9e542969e45903026897b0dc4925e66130e745d059a80f5479021e36f79b98eddd1022ead6b7806e58ee9