9:59 a.m.
commit 4b76277c98c4ef8a053becc7c6ed35618e220e4f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Mar 31 10:57:16 2023 +0100
apply offical patches for el 8 and 9 but we don't use at 9
...inux-vboxvideo-Additional-build-fixes-for.patch | 84 ++++++++++++++++++++++
VirtualBox-kmod.spec | 8 ++-
el8_7.patch | 11 ---
3 files changed, 89 insertions(+), 14 deletions(-)
---
diff --git a/0001-Additions-Linux-vboxvideo-Additional-build-fixes-for.patch
b/0001-Additions-Linux-vboxvideo-Additional-build-fixes-for.patch
new file mode 100644
index 0000000..0018ff9
--- /dev/null
+++ b/0001-Additions-Linux-vboxvideo-Additional-build-fixes-for.patch
@@ -0,0 +1,84 @@
+From d18573c3ae3bbdff00fcedc687fa1faeb6a3b577 Mon Sep 17 00:00:00 2001
+From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
+Date: Thu, 2 Feb 2023 19:50:15 +0000
+Subject: [PATCH] Additions: Linux: vboxvideo: Additional build fixes for RHEL
+ 9.1 and 9.2 kernels, bugref:10190, bugref:10237, bugref:10279,
+ ticketref:21446, ticketref:21450.
+
+git-svn-id: http://www.virtualbox.org/svn/vbox@98455
cfe28804-0f27-0410-a406-dd0f0b0b656f
+---
+ trunk/src/VBox/Additions/linux/drm/vbox_drv.c | 2 +-
+ trunk/src/VBox/Additions/linux/drm/vbox_drv.h | 2 +-
+ trunk/src/VBox/Additions/linux/drm/vbox_mode.c | 2 +-
+ trunk/src/VBox/Additions/linux/drm/vbox_ttm.c | 13 +++++++------
+ 4 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/trunk/src/VBox/Additions/linux/drm/vbox_drv.c
b/trunk/src/VBox/Additions/linux/drm/vbox_drv.c
+index b3f22e56e39..b85f4b9a618 100644
+--- a/vboxvideo/vbox_drv.c
++++ b/vboxvideo/vbox_drv.c
+@@ -52,7 +52,7 @@
+
+ /** Detect whether kernel mode setting is OFF. */
+ #if defined(CONFIG_VGA_CONSOLE)
+-# if RTLNX_VER_MIN(5,17,0)
++# if RTLNX_VER_MIN(5,17,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1)
+ # define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset ==
-1
+ # elif RTLNX_VER_MIN(4,7,0)
+ # define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
+diff --git a/trunk/src/VBox/Additions/linux/drm/vbox_drv.h
b/trunk/src/VBox/Additions/linux/drm/vbox_drv.h
+index 0a5a5f051d8..2902865848d 100644
+--- a/vboxvideo/vbox_drv.h
++++ b/vboxvideo/vbox_drv.h
+@@ -185,7 +185,7 @@
+ # include <drm/ttm/ttm_resource.h>
+ #endif
+
+-#if RTLNX_VER_MIN(6,0,0)
++#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
+ # include <drm/drm_framebuffer.h>
+ #endif
+
+diff --git a/trunk/src/VBox/Additions/linux/drm/vbox_mode.c
b/trunk/src/VBox/Additions/linux/drm/vbox_mode.c
+index c6b7ef3143e..9f4316dd55b 100644
+--- a/vboxvideo/vbox_mode.c
++++ b/vboxvideo/vbox_mode.c
+@@ -46,7 +46,7 @@
+ # include <drm/drm_probe_helper.h>
+ #endif
+
+-#if RTLNX_VER_MIN(6,0,0)
++#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
+ # include <drm/drm_edid.h>
+ #endif
+
+diff --git a/trunk/src/VBox/Additions/linux/drm/vbox_ttm.c
b/trunk/src/VBox/Additions/linux/drm/vbox_ttm.c
+index 5cc20cb8edd..abb027fcb88 100644
+--- a/vboxvideo/vbox_ttm.c
++++ b/vboxvideo/vbox_ttm.c
+@@ -316,15 +316,16 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_buffer_object
*bo,
+ #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
+ tt->func = &vbox_tt_backend_func;
+ #endif
+-#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) &&
!RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
+- if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
+-#elif RTLNX_VER_MAX(5,11,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
+- if (ttm_tt_init(tt, bo, page_flags)) {
+-#elif RTLNX_VER_MAX(5,19,0)
++#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
++ if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
++#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
+ if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
++#elif RTLNX_VER_MIN(4,17,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1)
|| RTLNX_SUSE_MAJ_PREREQ(12,5)
++ if (ttm_tt_init(tt, bo, page_flags)) {
+ #else
+- if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
++ if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
+ #endif
++
+ kfree(tt);
+ return NULL;
+ }
+--
+2.39.2
+
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 9cb9462..5939ffa 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -40,7 +40,7 @@
Name: VirtualBox-kmod
Version: 7.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -48,7 +48,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: el8_7.patch
+Patch1: 0001-Additions-Linux-vboxvideo-Additional-build-fixes-for.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc = %{version} xz time
elfutils-libelf-devel gcc
@@ -132,8 +132,10 @@ rm -rf %{name}-%{version}/vboxsf
DIRS=$(ls %{name}-%{version} |wc -l)
[ $MODS = $DIRS ] || [ $MODS = 0 ]
-
%changelog
+* Fri Mar 31 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.6-3
+- apply offical patches for el 8 and 9 but we don't use at 9
+
* Wed Jan 18 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.6-1
- Update to 7.0.6