From d9d5fe30bb3a6bb1c27aaf547f8bd04d2e2b7bd5c174905c927f1eb99749dc12 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 15 Jun 2019 13:41:39 +0000 Subject: [PATCH] Accepting request 709210 from home:lwfinger:branches:openSUSE:Factory - Fix build for SLE15 SP1 - add file "fixes_for_SLE15.patch" OBS-URL: https://build.opensuse.org/request/show/709210 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=493 --- fixes_for_5.2.patch | 7 +++++++ fixes_for_SLE15.patch | 16 ++++++++++++++++ virtualbox.changes | 5 +++++ virtualbox.spec | 4 ++++ 4 files changed, 32 insertions(+) create mode 100644 fixes_for_SLE15.patch diff --git a/fixes_for_5.2.patch b/fixes_for_5.2.patch index 4866c7e..a103ecc 100644 --- a/fixes_for_5.2.patch +++ b/fixes_for_5.2.patch @@ -1,3 +1,10 @@ +There are two kernel 5.2 API changes that affect VirtualBox: + +1. drm_fb_helper_fill_fix() and drm_fb_helper_fill_var() are replaced + by drm_fb_helper_fill_info(). +2. The arguments for ttm_bo_device_init() are changed. + + Index: VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_fb.c =================================================================== --- VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_fb.c diff --git a/fixes_for_SLE15.patch b/fixes_for_SLE15.patch new file mode 100644 index 0000000..ef4f2f5 --- /dev/null +++ b/fixes_for_SLE15.patch @@ -0,0 +1,16 @@ +Index: VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +=================================================================== +--- VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_drv.c +@@ -283,11 +283,6 @@ static struct drm_driver driver = { + .lastclose = vbox_driver_lastclose, + .master_set = vbox_master_set, + .master_drop = vbox_master_drop, +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73) +-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75) +- .set_busid = drm_pci_set_busid, +-# endif +-#endif + + .fops = &vbox_fops, + .irq_handler = vbox_irq_handler, diff --git a/virtualbox.changes b/virtualbox.changes index 31cc013..9de8dc3 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 10 18:09:09 UTC 2019 - Larry Finger + +- Fix build for SLE15 SP1 - add file "fixes_for_SLE15.patch" + ------------------------------------------------------------------- Thu May 30 02:58:13 UTC 2019 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 9829fb3..2576a9e 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -147,6 +147,8 @@ Patch130: fixes_for_Leap42.3.patch Patch131: fixes_for_qt5.13.patch # Fixes for kernel 5.2 Patch132: fixes_for_5.2.patch +# Fixes for SLE15 +Patch133: fixes_for_SLE15.patch #endif Patch999: virtualbox-fix-ui-background-color.patch # @@ -450,6 +452,8 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. # Tumbleweed, Leap 15.1 and above drm adjustments %if 0%{?suse_version} > 1500 || (0%{?sle_version} >= 150100 && 0%{?is_opensuse}) %patch129 -p1 +%else +%patch133 -p1 %endif # Leap 42.3 adjustments %if 0%{?sle_version} == 120300 && 0%{?is_opensuse}