10:42 p.m.
commit 17f74f035d5e0db13214378c0446d0dfb66f067b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jan 21 22:18:21 2021 +0000
Update to 6.1.18
VirtualBox-kmod.spec | 15 ++--
fixes-for-5.11.patch | 14 ++++
fixes_4.10.patch | 188 -------------------------------------------------
fixes_centos_8.4.patch | 16 -----
update_vbox.sh | 6 +-
5 files changed, 25 insertions(+), 214 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index c0e70ba..9e6f8c0 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -16,8 +16,8 @@
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
%if 0%{?fedora}
-%global buildforkernels akmod
%endif
+%global buildforkernels akmod
#akmods still generate debuginfo but have the wrong name:
#/var/cache/akmods/VirtualBox/VirtualBox-kmod-debuginfo-5.0.4-1.fc21.x86_64.rpm
#/var/cache/akmods/VirtualBox/kmod-VirtualBox-4.1.8-100.fc21.x86_64-5.0.4-1.fc21.x86_64.rpm
@@ -35,8 +35,8 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 6.1.16
-Release: 3%{?dist}
+Version: 6.1.18
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -44,8 +44,7 @@ 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
-Patch1: fixes_4.10.patch
-Patch2: fixes_centos_8.4.patch
+Patch1: fixes-for-5.11.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >=
%{version}%{vboxreltag} xz time elfutils-libelf-devel gcc
@@ -72,9 +71,8 @@ Kernel module for VirtualBox
%prep
%setup -T -c
tar --use-compress-program xz -xf
%{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
-%patch1 -p0
-%patch2 -p0
pushd %{name}-%{version}
+%patch1 -p1
popd
# error out if there was something wrong with kmodtool
@@ -138,6 +136,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Thu Jan 21 2021 Sérgio Basto <sergio(a)serjux.com> - 6.1.18-1
+- Update to 6.1.18
+
* Sun Dec 13 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.16-3
- Add fixes for Centos 8.4
diff --git a/fixes-for-5.11.patch b/fixes-for-5.11.patch
new file mode 100644
index 0000000..4473782
--- /dev/null
+++ b/fixes-for-5.11.patch
@@ -0,0 +1,14 @@
+Index: VirtualBox-6.1.16/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+===================================================================
+--- VirtualBox-kmod-6.1.18.orig/vboxnetflt/linux/VBoxNetFlt-linux.c
++++ VirtualBox-kmod-6.1.18/vboxnetflt/linux/VBoxNetFlt-linux.c
+@@ -342,6 +342,9 @@ typedef struct ethtool_ops OVR_OPSTYPE;
+
+ # else /* RTLNX_VER_MIN(2,6,29) */
+
++#if RTLNX_VER_MIN(5,11,0)
++# include <linux/ethtool.h>
++#endif
+ typedef struct net_device_ops OVR_OPSTYPE;
+ # define OVR_OPS netdev_ops
+ # define OVR_XMIT pOrgOps->ndo_start_xmit
diff --git a/update_vbox.sh b/update_vbox.sh
index c377df9..5ac3f56 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=6.1.16
+VERSION=6.1.18
REL=1
RAWHIDE=34
-REPOS="f33 f32 f31 el8 el7"
+REPOS="f33 f32 el8 el7"
if [ -z "$1" ]
then
@@ -17,12 +17,12 @@ if test $stage -le 0
then
echo STAGE 0
rpmdev-bumpspec -n $VERSION -c "Update to $VERSION" VirtualBox-kmod.spec
-rfpkg ci -c && git show
rfpkg srpm && copr-cli build sergiomb/vboxfor23
VirtualBox-kmod-$VERSION-$REL.fc$RAWHIDE.src.rpm
#rfpkg srpm && mock -r fedora-27-x86_64-rpmfusion_free --no-clean --rebuild
smplayer-17.5.0-1.fc27.src.rpm
#cp VirtualBox-kmod.spec VirtualBox-kmod.spec.new
#git reset HEAD~1
#git rm kernel-4.10.0-0.rc5.lnkops.v2.patch
+rfpkg ci -c && git show
echo Press enter to continue; read dummy;
#koji-rpmfusion watch-task
fi