Accepting request 913870 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/913870
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=222

fixes_for_leap15.4.patch

@@ -0,0 +1,15 @@
+Index: VirtualBox-6.1.26/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+===================================================================
+--- VirtualBox-6.1.26.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-6.1.26/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -137,9 +137,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/completion.h>
+ #include <linux/compiler.h>
+-#if RTLNX_VER_MIN(5,9,0) || RTLNX_SUSE_MAJ_PREREQ(15,3) /* linux/fs.h defined HAVE_UNLOCKED_IOCTL from 2.6.11 up to 5.9 (also 5.3.18-56 in SLES15-SP3), when it became an implicit assumption. */
+-# define HAVE_UNLOCKED_IOCTL 1 /* We use this in a couple of places, so for now just define it for 5.9+ too. */
+-#endif
++#define HAVE_UNLOCKED_IOCTL 1 /* We use this in a couple of places, so for now just define it for 5.9+ too. */
+ #if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
+ # include <linux/smp_lock.h>
+ #endif

virtualbox.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 23 16:12:57 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
+
+- Patch build to work with the Leap 15.4 kernel.
+  File "fixes_for_leap15.4.patch" as added. 
+
 -------------------------------------------------------------------
 Thu Jul 29 18:34:12 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
 

virtualbox.spec

@@ -177,6 +177,7 @@ Patch141:       vb-6.1.16-modal-dialog-parent.patch
 # Fixes for kernel 5.14
 Patch142:       fixes_for_5.14.patch
 Patch143:       fix_ordering_of_qt_includes.patch
+Patch144:       fixes_for_leap15.4.patch
 Patch999:       virtualbox-fix-ui-background-color.patch
 #
 # Common BuildRequires for both virtualbox and virtualbox-kmp
@@ -305,6 +306,8 @@ the terms of the GNU Public License (GPL).
 
 
 
+
+
 ##########################################
 %package qt
 Summary:        Qt GUI part for %{name}
@@ -326,6 +329,8 @@ This package contains the code for the GUI used to control VMs.
 
 
 
+
+
 #########################################
 %package websrv
 Summary:        WebService GUI part for %{name}
@@ -341,6 +346,8 @@ The VirtualBox web server is used to control headless VMs using a browser.
 
 
 
+
+
 #########################################
 %package guest-x11
 Summary:        VirtualBox X11 drivers for mouse and video
@@ -358,6 +365,8 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers
 
 
 
+
+
 ###########################################
 %package guest-tools
 Summary:        VirtualBox guest tools
@@ -380,6 +389,8 @@ VirtualBox guest addition tools.
 
 
 
+
+
 ###########################################
 %package -n python3-%{name}
 Summary:        Python bindings for %{name}
@@ -402,6 +413,8 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
 
 
 
+
+
 ###########################################
 %package devel
 Summary:        Devel files for %{name}
@@ -419,6 +432,8 @@ Development file for %{name}
 
 
 
+
+
 ###########################################
 %package host-source
 Summary:        Source files for %{name} host kernel modules
@@ -453,6 +468,8 @@ sudo /sbin/vboxguestconfig
 
 
 
+
+
 ###########################################
 %package guest-desktop-icons
 Summary:        Icons for guest desktop files
@@ -468,6 +485,8 @@ This package contains icons for guest desktop files that were created on the des
 
 
 
+
+
 ###########################################
 %package vnc
 Summary:        VNC desktop sharing
@@ -542,6 +561,10 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
 %patch141 -p1
 %patch142 -p1
 %patch143 -p1
+%if 0%{?sle_version} == 1504 && 0%{?is_opensuse}
+# Patch for Leap 15.4
+%patch144 -p1
+%endif
 # make VB UI background colors look sane again
 %patch999 -p1