[VirtualBox-kmod: 3/3] Merge branch 'el9'
by Sérgio M. Basto
commit e0b02d62ddaa23c8fab6aa7b473b42eec3d4ea5c
Merge: c20e375 f3fbc70
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 26 00:36:41 2022 +0100
Merge branch 'el9'
VirtualBox-kmod.spec | 7 +++++++
cs9.v2.patch | 11 +++++++++++
2 files changed, 18 insertions(+)
---
1 year, 9 months
[VirtualBox-kmod: 2/3] Update to 6.1.36
by Sérgio M. Basto
commit f3fbc70263c2ea9d13bb3dfc86a6b0ad4841a82b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 26 00:33:38 2022 +0100
Update to 6.1.36
VirtualBox-kmod.spec | 16 ++++++--------
cs9.patch | 60 ----------------------------------------------------
cs9.v2.patch | 35 ++++++------------------------
sources | 1 -
update_vbox.sh | 4 ++--
5 files changed, 16 insertions(+), 100 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 41aa5c8..8cb2958 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -30,17 +30,13 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%if 0%{?fedora}
-%global vboxrel 3
-%else
-%global vboxrel 2
-%endif
+%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
Name: VirtualBox-kmod
-Version: 6.1.34
-Release: 5%{?dist}
+Version: 6.1.36
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -48,7 +44,6 @@ 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: cs9.patch
Patch2: cs9.v2.patch
@@ -71,7 +66,7 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-%patch1 -p1
+#patch1 -p1
%if ! 0%{?fedora}
%patch2 -p1
%endif
@@ -138,6 +133,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Mon Jul 25 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.36-1
+- Update to 6.1.36
+
* Sun Jun 19 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-5
- Add cs9.2.patch
diff --git a/cs9.v2.patch b/cs9.v2.patch
index 628e8b4..e24388d 100644
--- a/cs9.v2.patch
+++ b/cs9.v2.patch
@@ -1,32 +1,11 @@
-From 94e81a17ce6c02791b1f343281b7191b210dccb5 Mon Sep 17 00:00:00 2001
-From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
-Date: Wed, 6 Apr 2022 17:05:49 +0000
-Subject: [PATCH] Linux: Host Drivers: VBoxNetFlt: Initial support for kernel
- 5.18-rc1, bugref:10209.
-
-git-svn-id: http://www.virtualbox.org/svn/vbox@94501 cfe28804-0f27-0410-a406-dd0f0b0b656f
----
- .../VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-index 08d985049ec..ef54e7fd8af 100644
---- a/vboxnetflt/linux/VBoxNetFlt-linux.c
-+++ b/vboxnetflt/linux/VBoxNetFlt-linux.c
-@@ -2311,7 +2311,13 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, u
+--- a/vboxnetflt/linux/VBoxNetFlt-linux.c.orig 2022-07-26 00:25:39.750727744 +0100
++++ b/vboxnetflt/linux/VBoxNetFlt-linux.c 2022-07-26 00:27:46.298624937 +0100
+@@ -2311,7 +2311,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS
vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1);
Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb));
Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
+-#if RTLNX_VER_MIN(5,18,0)
+#if RTLNX_VER_MIN(5,18,0) || RTLNX_RHEL_MAJ_PREREQ(9,1)
-+ local_bh_disable();
-+ err = netif_rx(pBuf);
-+ local_bh_enable();
-+#else
- err = netif_rx_ni(pBuf);
-+#endif
- if (err)
- rc = RTErrConvertFromErrno(err);
- }
---
-2.34.1
-
+ local_bh_disable();
+ err = netif_rx(pBuf);
+ local_bh_enable();
diff --git a/sources b/sources
index 5e42cfa..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-SHA512 (5aba938.tar.gz) = 15e0decfe463e0fbff5ef61e1cc5af231fbcaf3b64f9e542969e45903026897b0dc4925e66130e745d059a80f5479021e36f79b98eddd1022ead6b7806e58ee9
diff --git a/update_vbox.sh b/update_vbox.sh
index 89f0993..2538b50 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=6.1.34
+VERSION=6.1.36
REL=1
RAWHIDE=37
-REPOS="f36 f35 f34 el9 el8 el7"
+REPOS="f36 f35 el9 el8 el7"
if [ -z "$1" ]
then
1 year, 9 months
[VirtualBox-kmod] Drop cs9.patch to fix the build
by Sérgio M. Basto
commit c20e3753164d6f5e308d88aaeb0e53e2c7ac5876
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jul 25 23:18:09 2022 +0100
Drop cs9.patch to fix the build
VirtualBox-kmod.spec | 3 +--
cs9.patch | 60 ----------------------------------------------------
2 files changed, 1 insertion(+), 62 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 9fea72f..570f57a 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -44,7 +44,6 @@ 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: cs9.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >= %{version}%{vboxreltag} xz time elfutils-libelf-devel gcc
@@ -66,7 +65,7 @@ Kernel module for VirtualBox
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
-%patch1 -p1
+#patch1 -p1
popd
# error out if there was something wrong with kmodtool
1 year, 9 months
[VirtualBox-kmod/f35] (3 commits) ...Update to 6.1.36
by Sérgio M. Basto
Summary of changes:
816e096... Add cs9.patch rfbz#(6328) (*)
a6f14c5... adjust vboxrel version on el (*)
db9f014... Update to 6.1.36 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 9 months
[VirtualBox/el9] Fix el7 build
by Sérgio M. Basto
Summary of changes:
fd9ef30... Fix el7 build (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 9 months
[VirtualBox-kmod/f36] (3 commits) ...Update to 6.1.36
by Sérgio M. Basto
Summary of changes:
816e096... Add cs9.patch rfbz#(6328) (*)
a6f14c5... adjust vboxrel version on el (*)
db9f014... Update to 6.1.36 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 9 months
[VirtualBox-kmod] Update to 6.1.36
by Sérgio M. Basto
commit db9f0142015c1512425b8b2e3b6e8b3358a0b58b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jul 25 21:28:16 2022 +0100
Update to 6.1.36
VirtualBox-kmod.spec | 13 ++++++-------
sources | 1 -
update_vbox.sh | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index ff88f0a..9fea72f 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -30,17 +30,13 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%if 0%{?fedora}
-%global vboxrel 3
-%else
-%global vboxrel 2
-%endif
+%global vboxrel 1
%global vboxreltag %{?vboxrel:-%{vboxrel}}
Name: VirtualBox-kmod
-Version: 6.1.34
-Release: 4%{?dist}
+Version: 6.1.36
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -134,6 +130,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Mon Jul 25 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.36-1
+- Update to 6.1.36
+
* Sat Jun 18 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-4
- Add cs9.patch rfbz#(6328)
diff --git a/sources b/sources
index 5e42cfa..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-SHA512 (5aba938.tar.gz) = 15e0decfe463e0fbff5ef61e1cc5af231fbcaf3b64f9e542969e45903026897b0dc4925e66130e745d059a80f5479021e36f79b98eddd1022ead6b7806e58ee9
diff --git a/update_vbox.sh b/update_vbox.sh
index 89f0993..2538b50 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=6.1.34
+VERSION=6.1.36
REL=1
RAWHIDE=37
-REPOS="f36 f35 f34 el9 el8 el7"
+REPOS="f36 f35 el9 el8 el7"
if [ -z "$1" ]
then
1 year, 9 months