[VirtualBox-kmod/el7] add kernel 5.18 patch
by Sérgio M. Basto
commit ebeea66404ec36621bcb848de6f667cb7ede992e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 21 12:54:02 2022 +0100
add kernel 5.18 patch
...Drivers-VBoxNetFlt-Initial-support-for-ke.patch | 32 ++++++++++++++++++++++
VirtualBox-kmod.spec | 8 ++++--
2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch b/0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch
new file mode 100644
index 0000000..d2e1316
--- /dev/null
+++ b/0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch
@@ -0,0 +1,32 @@
+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
+ 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)
++ 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
+
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index f892fd8..2f020e2 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -34,7 +34,7 @@
Name: VirtualBox-kmod
Version: 6.1.34
-Release: 1%{?dist}
+Release: 2%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -42,6 +42,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: 0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >= %{version}%{vboxreltag} xz time elfutils-libelf-devel gcc
@@ -63,7 +64,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
@@ -127,6 +128,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Thu Apr 21 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-2
+- add kernel 5.18 patch
+
* Wed Apr 20 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-1
- Update to 6.1.34
- Enable binary kmods on el repos
2 years
[nvidia-390xx-kmod] Try to fix linux-5.17 based on patch provided on https://bugzilla.rpmfusion.org/6263
by Sérgio M. Basto
commit e65c072b3f1aee47cdf0e877a3171c466440c51e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 21 00:48:21 2022 +0100
Try to fix linux-5.17 based on patch provided on https://bugzilla.rpmfusion.org/6263
nvidia-390xx-kmod.spec | 7 ++++++-
nvidia-470xx-fix-linux-5.17.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 4b25ca9..9e1550b 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -18,7 +18,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.147
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -39,6 +39,7 @@ Patch12: do-div-cast.patch
Patch13: kernel-5.7.0-set-memory-array.patch
Patch14: kernel-5.12.patch
Patch15: https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/ker...
+Patch16: nvidia-470xx-fix-linux-5.17.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -87,6 +88,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch13 -p1 -b 13 -d kernel
%patch14 -p2 -b 14 -d kernel
%patch15 -p2 -b 15 -d kernel
+%patch16 -p2 -b 15 -d kernel
%patch30 -p1 -b 30 -d kernel
%patch31 -p1 -b 31 -d kernel
%patch32 -p1 -b 32 -d kernel
@@ -123,6 +125,9 @@ done
%changelog
+* Wed Apr 20 2022 Sérgio Basto <sergio(a)serjux.com> - 3:390.147-3
+- Try to fix linux-5.17 based on patch provided on https://bugzilla.rpmfusion.org/6263
+
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:390.147-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/nvidia-470xx-fix-linux-5.17.patch b/nvidia-470xx-fix-linux-5.17.patch
new file mode 100644
index 0000000..606a9eb
--- /dev/null
+++ b/nvidia-470xx-fix-linux-5.17.patch
@@ -0,0 +1,37 @@
+adaptation to 39xx
+
+From 026a2a54a234cdb7bf78c17be7ea29d8dcf9f390 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram(a)gmail.com>
+Date: Sun, 23 Jan 2022 16:28:18 +0100
+Subject: [PATCH] Tentative fix for NVIDIA 470.94 driver for Linux 5.17-rc1
+
+See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit...
+
+---
+ common/inc/nv-procfs-utils.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/kernel/common/inc/nv-procfs.h b/kernel/common/inc/nv-procfs.h
+index 7c3e1a3..462eac1 100644
+--- a/kernel/common/inc/nv-procfs.h
++++ b/kernel/common/inc/nv-procfs.h
+@@ -10,6 +10,7 @@
+ #ifndef _NV_PROCFS_H
+ #define _NV_PROCFS_H
+
++#include <linux/version.h>
+ #include "conftest.h"
+
+ #ifdef CONFIG_PROC_FS
+@@ -87,6 +88,8 @@ typedef struct file_operations nv_proc_ops_t;
+
+ #if defined(NV_PDE_DATA_PRESENT)
+ # define NV_PDE_DATA(inode) PDE_DATA(inode)
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++# define NV_PDE_DATA(inode) pde_data(inode)
+ #else
+ # define NV_PDE_DATA(inode) PDE(inode)->data
+ #endif
+--
+2.34.1
+
2 years
[ltris/f36] Update ltris to 1.2.4
by Sérgio M. Basto
Summary of changes:
7dbf1e7... Update ltris to 1.2.4 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years
[ltris] Update ltris to 1.2.4
by Sérgio M. Basto
commit 7dbf1e70f75e5d009fc980a12468574f54c3dea3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Apr 20 18:54:10 2022 +0100
Update ltris to 1.2.4
.gitignore | 1 +
ltris.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0066db4..bf93dc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ltris-1.0.19.tar.gz
/ltris_b607a8d..b73e996.patch
/ltris_b607a8d..b73e996.v2.patch
/ltris-1.2.3.tar.gz
+/ltris-1.2.4.tar.gz
diff --git a/ltris.spec b/ltris.spec
index 660520e..d783c61 100644
--- a/ltris.spec
+++ b/ltris.spec
@@ -1,7 +1,7 @@
Summary: Game of skill with falling blocks
Name: ltris
-Version: 1.2.3
-Release: 2%{?dist}
+Version: 1.2.4
+Release: 1%{?dist}
License: GPLv2+
URL: http://lgames.sourceforge.net/
@@ -67,6 +67,9 @@ appstream-util validate --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Wed Apr 20 2022 Sérgio Basto <sergio(a)serjux.com> - 1.2.4-1
+- Update ltris to 1.2.4
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index 4dcae07..b61f541 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ltris-1.2.3.tar.gz) = 0a910a764fea78b127ae637a28b2e509a9bb4b21f1bd0ee213d07ceaf6885d4d23a6d7098be2c64bfcd47aa447ac8431f7252f09e34aff778877cc2effaa66f8
+SHA512 (ltris-1.2.4.tar.gz) = 58781aff51d212c1fcaa58f07aea72f51311ab9ccc96e01adce226bdefb1c988898b87018c29bd240cac51627322564bf20358327b633c763785869267468076
2 years