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

Accepting request 590432 from Virtualization

Browse Source 
- Further updates for Leap 15 kernel API changes.

-  Remove extraneouos %posttrans macros

-  Update so that the system will build on the new Leap 15 kernel.

OBS-URL: https://build.opensuse.org/request/show/590432
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=159
This commit is contained in:
Dominique Leuenberger 2018-03-24 15:08:11 +00:00 committed by Git OBS Bridge
commit 8d9b659c19
3 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fixes_for_leap15.patch
View File

@ -1,7 +1,7 @@
Index: VirtualBox-5.2.6/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h Index: VirtualBox-5.2.8/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
=================================================================== ===================================================================
--- VirtualBox-5.2.6.orig/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h --- VirtualBox-5.2.8.orig/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
+++ VirtualBox-5.2.6/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h +++ VirtualBox-5.2.8/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
typedef struct RTR0SEMLNXWAIT typedef struct RTR0SEMLNXWAIT
{ {
@ -11,10 +11,10 @@ Index: VirtualBox-5.2.6/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
wait_queue_entry_t WaitQE; wait_queue_entry_t WaitQE;
#else #else
wait_queue_t WaitQE; wait_queue_t WaitQE;
Index: VirtualBox-5.2.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c Index: VirtualBox-5.2.8/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
=================================================================== ===================================================================
--- VirtualBox-5.2.6.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c --- VirtualBox-5.2.8.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-5.2.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-5.2.8/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -150,6 +150,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX @@ -150,6 +150,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
# endif # endif
#endif #endif
@ -26,3 +26,19 @@ Index: VirtualBox-5.2.6/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
# define VBOX_HAVE_SKB_VLAN # define VBOX_HAVE_SKB_VLAN
#else #else
Index: VirtualBox-5.2.8/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- VirtualBox-5.2.8.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-5.2.8/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -401,11 +401,7 @@ static struct drm_encoder *vbox_best_sin
/* pick the encoder ids */
if (enc_id)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
return drm_encoder_find(connector->dev, NULL, enc_id);
-#else
- return drm_encoder_find(connector->dev, enc_id);
-#endif
return NULL;
}

15
virtualbox.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Mar 22 19:32:44 UTC 2018 - Larry.Finger@lwfinger.net
- Further updates for Leap 15 kernel API changes.
-------------------------------------------------------------------
Wed Mar 21 15:28:52 UTC 2018 - Larry.Finger@lwfinger.net
- Remove extraneouos %posttrans macros
-------------------------------------------------------------------
Wed Mar 21 04:06:19 UTC 2018 - Larry.Finger@lwfinger.net
- Update so that the system will build on the new Leap 15 kernel.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 10 21:20:15 UTC 2018 - Larry.Finger@lwfinger.net Sat Mar 10 21:20:15 UTC 2018 - Larry.Finger@lwfinger.net

5
virtualbox.spec
View File

@ -109,7 +109,7 @@ Patch115: vbox_fix_for_gcc7.patch
Patch116: Fix_for_server_1.19.patch Patch116: Fix_for_server_1.19.patch
# Fix invalid use of internal headers # Fix invalid use of internal headers
Patch118: internal-headers.patch Patch118: internal-headers.patch
# Fix kernl API change in Leap 15 # Fix kernel API change in Leap 15
Patch119: fixes_for_leap15.patch Patch119: fixes_for_leap15.patch
# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py # Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
Patch120: fixes_for_python.patch Patch120: fixes_for_python.patch
@ -409,7 +409,10 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%endif %endif
%patch120 -p1 %patch120 -p1
%patch121 -p1 %patch121 -p1
%if 0%{suse_version} != 1500
# The patch for kernel 4.16 interferes with Leap 15 fixes
%patch122 -p1 %patch122 -p1
%endif
#copy user manual #copy user manual
cp %{SOURCE1} UserManual.pdf cp %{SOURCE1} UserManual.pdf