jengelh/virtualbox
SHA256
1
0
Fork 2
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 1239250 from Virtualization

Browse Source 
- add: kernel-6-13.patch (bsc#1235146)

OBS-URL: https://build.opensuse.org/request/show/1239250
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=286
This commit is contained in:
Ana Guerrero 2025-01-22 15:30:41 +00:00 committed by Git OBS Bridge
commit 74a76a8cf6
5 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_scmsync.obsinfo
View File

@ -1,4 +1,4 @@
mtime: 1735954997 mtime: 1737458744
commit: c10cfbdb7cc20c2a99a15daf9c40809212540aab1ddbd420c6f3f2cbf8a152ca commit: 163ca1c484a13ebe32b8646ae919435d86274337727df55b2b9b05141da30b8d
url: https://src.opensuse.org/jengelh/virtualbox url: https://src.opensuse.org/jengelh/virtualbox
revision: master revision: master

2
build.specials.obscpio
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9193ffb3e96bb907f786b6cd35890f03d4010731ca8ab58452b730c341219cd4 oid sha256:18c47dba38c5c9d491cb82c25adef387a3361748179f850805a0587b1c160a29
size 256 size 256

32
kernel-6-13.patch Normal file
View File

@ -0,0 +1,32 @@
From: Jiri Slaby <jslaby@suse.cz>
Subject: fix for kernel 6.13 build
References: bsc#1235146
---
src/VBox/Additions/linux/drm/vbox_drv.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/src/VBox/Additions/linux/drm/vbox_drv.c
+++ b/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -43,7 +43,9 @@
# include <drm/drm_probe_helper.h>
#endif
-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
+#if RTLNX_VER_MIN(6,13,0)
+# include <linux/aperture.h>
+#elif RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
# include <drm/drm_aperture.h>
#endif
@@ -85,7 +87,9 @@ static int vbox_pci_probe(struct pci_dev
int ret = 0;
# if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
-# if RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1) || RTLNX_SUSE_MAJ_PREREQ(15,4)
+# if RTLNX_VER_MIN(6,13,0)
+ ret = aperture_remove_conflicting_pci_devices(pdev, driver.name);
+# elif RTLNX_VER_MIN(5,15,0) || RTLNX_RHEL_RANGE(8,7, 8,99) || RTLNX_RHEL_MIN(9,1) || RTLNX_SUSE_MAJ_PREREQ(15,4)
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
# else
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "vboxvideofb");

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 21 11:17:17 UTC 2025 - Jiri Slaby <jslaby@suse.cz>
- add: kernel-6-13.patch (bsc#1235146)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 4 01:40:37 UTC 2025 - Jan Engelhardt <jengelh@inai.de> Sat Jan 4 01:40:37 UTC 2025 - Jan Engelhardt <jengelh@inai.de>

3
virtualbox.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package virtualbox # spec file for package virtualbox
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -117,6 +117,7 @@ Patch9: vbox-usb-warning.diff
Patch10: fix_for_leap15.5.patch Patch10: fix_for_leap15.5.patch
Patch11: cxx17.patch Patch11: cxx17.patch
Patch12: host-source.patch Patch12: host-source.patch
Patch13: kernel-6-13.patch
# #
# Common BuildRequires for both virtualbox and virtualbox-kmp # Common BuildRequires for both virtualbox and virtualbox-kmp
BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: %{kernel_module_package_buildreqs}