diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8ef1fbc..79e2c51 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1735954997 -commit: c10cfbdb7cc20c2a99a15daf9c40809212540aab1ddbd420c6f3f2cbf8a152ca +mtime: 1737458744 +commit: 163ca1c484a13ebe32b8646ae919435d86274337727df55b2b9b05141da30b8d url: https://src.opensuse.org/jengelh/virtualbox revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 104fc3e..7ea3117 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9193ffb3e96bb907f786b6cd35890f03d4010731ca8ab58452b730c341219cd4 +oid sha256:18c47dba38c5c9d491cb82c25adef387a3361748179f850805a0587b1c160a29 size 256 diff --git a/kernel-6-13.patch b/kernel-6-13.patch new file mode 100644 index 0000000..ab71427 --- /dev/null +++ b/kernel-6-13.patch @@ -0,0 +1,32 @@ +From: Jiri Slaby +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 + #endif + +-#if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99) ++#if RTLNX_VER_MIN(6,13,0) ++# include ++#elif RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99) + # include + #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"); diff --git a/virtualbox.changes b/virtualbox.changes index 2261512..8b48e04 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 21 11:17:17 UTC 2025 - Jiri Slaby + +- add: kernel-6-13.patch (bsc#1235146) + ------------------------------------------------------------------- Sat Jan 4 01:40:37 UTC 2025 - Jan Engelhardt diff --git a/virtualbox.spec b/virtualbox.spec index 476bdf0..0375642 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # # 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 # 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 Patch11: cxx17.patch Patch12: host-source.patch +Patch13: kernel-6-13.patch # # Common BuildRequires for both virtualbox and virtualbox-kmp BuildRequires: %{kernel_module_package_buildreqs}