From d72c0caca1f041502f8e9e70b7c316b9daca5ba3bacc1fc0d33b2ee4f82d2d60 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 28 May 2019 00:19:51 +0000 Subject: [PATCH 1/4] Accepting request 705282 from home:lwfinger:branches:openSUSE:Factory - Version bump to 6.0.8 (released May 13 2019 by Oracle) This is a maintenance release. The following items were fixed and/or added: Core: fix saved state resume failures (bugs #18265 and #18331) User interface: show full file location in New Medium window. User interface: fix mouse click pass-through problems in multi-screen virtual machines (6.0.6 regression, bug #18567) Graphics: fixed a crash when powering off a VM without graphics controller (bug #18570) API: partial fix for dealing with VM config conflicting with other VMs related to medium UUIDs, now correctly flags VM as inaccessible (bug #17908) Linux hosts: fix kernel module build breakage in non-default build set-ups (bug #18620, thank you Ambroz Bizjak) Linux hosts: fix kernel module build breakage in debug build set-ups (bug #18621, thank you Ambroz Bizjak) Windows guests: notice file size increases in shared folders which were missed in certain cases Linux guests: make shared folders work with Linux 3.16.35 Linux guests: fix incorrectly read-only shared folders (bug #18345) - Modify "fixes_for_qt13.1" for i586 builds qith Qt 5.13 - Limit all architectures to a maxium of 2 jobs. Without this restriction, 32-bit builds run out of memory, and 64-bit builds get strange crashes. - LTO builds still failing. Reset flag to nil. - Changed the way that the spec file limits the 32-bit builds to 2 threads. boo#1133492. If enough memory were allocated so that the full number of workers were allowed, the job would never be scheduled. OBS-URL: https://build.opensuse.org/request/show/705282 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=488 --- UserManual.pdf | 4 +- VirtualBox-6.0.6-patched.tar.bz2 | 3 - VirtualBox-6.0.8-patched.tar.bz2 | 3 + fix_LTO_builds.patch | 13 ++++ fixes_for_qt5.13.patch | 109 +++++++++++++++++++------------ virtualbox.changes | 37 +++++++++++ virtualbox.spec | 13 ++-- 7 files changed, 130 insertions(+), 52 deletions(-) delete mode 100644 VirtualBox-6.0.6-patched.tar.bz2 create mode 100644 VirtualBox-6.0.8-patched.tar.bz2 create mode 100644 fix_LTO_builds.patch diff --git a/UserManual.pdf b/UserManual.pdf index 139dd60..cec9df6 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f4050a3fd73d8c25d7f02cdaf8c0ad3e3ef10100f4d9d2d5ef1203498d8b7f33 -size 4330514 +oid sha256:30c3e77c5148d46f9f5c8b281ba3322f2348aed35a0db354802ba60ca2f26b24 +size 4335316 diff --git a/VirtualBox-6.0.6-patched.tar.bz2 b/VirtualBox-6.0.6-patched.tar.bz2 deleted file mode 100644 index 169f6df..0000000 --- a/VirtualBox-6.0.6-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6816256900ca78222c6f103efa231dc0c2ca8f8670720b4da50bb4e7493c50c9 -size 118577509 diff --git a/VirtualBox-6.0.8-patched.tar.bz2 b/VirtualBox-6.0.8-patched.tar.bz2 new file mode 100644 index 0000000..52192ad --- /dev/null +++ b/VirtualBox-6.0.8-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdba6c705fdca590b213d2bc456f8876280022ec82a3280ee49e4c553a9eb381 +size 118703619 diff --git a/fix_LTO_builds.patch b/fix_LTO_builds.patch new file mode 100644 index 0000000..419f68e --- /dev/null +++ b/fix_LTO_builds.patch @@ -0,0 +1,13 @@ +Index: VirtualBox-6.0.6/Config.kmk +=================================================================== +--- VirtualBox-6.0.6.orig/Config.kmk ++++ VirtualBox-6.0.6/Config.kmk +@@ -21,6 +21,8 @@ + # Marker. + VBOX_ROOT_CONFIG_KMK_INCLUDED = 1 + ++# Turn off mangling for Link Time Option ++IPRT_IGNORE_TEST_MANGLING = 1 + + # + # kBuild stuff diff --git a/fixes_for_qt5.13.patch b/fixes_for_qt5.13.patch index 90944e1..6fa5eaa 100644 --- a/fixes_for_qt5.13.patch +++ b/fixes_for_qt5.13.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h +Index: VirtualBox-6.0.6/include/VBox/VBoxGL2D.h =================================================================== ---- VirtualBox-6.0.4.orig/include/VBox/VBoxGL2D.h -+++ VirtualBox-6.0.4/include/VBox/VBoxGL2D.h +--- VirtualBox-6.0.6.orig/include/VBox/VBoxGL2D.h ++++ VirtualBox-6.0.6/include/VBox/VBoxGL2D.h @@ -113,7 +113,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN /* GL_ARB_pixel_buffer_object*/ #ifndef Q_WS_MAC @@ -11,108 +11,131 @@ Index: VirtualBox-6.0.4/include/VBox/VBoxGL2D.h #endif #ifndef GL_READ_ONLY -Index: VirtualBox-6.0.4/include/VBox/HostServices/glext.h +Index: VirtualBox-6.0.6/include/VBox/HostServices/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/include/VBox/HostServices/glext.h -+++ VirtualBox-6.0.4/include/VBox/HostServices/glext.h -@@ -3395,7 +3395,7 @@ typedef char GLchar; /* native charact +--- VirtualBox-6.0.6.orig/include/VBox/HostServices/glext.h ++++ VirtualBox-6.0.6/include/VBox/HostServices/glext.h +@@ -3395,7 +3395,10 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h -@@ -465,7 +465,8 @@ GLAPI void APIENTRY glBlendEquation (GLe +--- VirtualBox-6.0.6.orig/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/Additions/3D/mesa/mesa-17.3.9/include/GL/glext.h +@@ -465,7 +465,12 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include --typedef ptrdiff_t GLsizeiptr; +#include ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -+++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h -@@ -614,7 +614,7 @@ GLAPI void APIENTRY glBlendEquation (GLe +--- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h ++++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glcorearb.h +@@ -614,7 +614,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h -@@ -465,7 +465,7 @@ GLAPI void APIENTRY glBlendEquation (GLe +--- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-11.0.7/GL/glext.h +@@ -465,7 +465,11 @@ GLAPI void APIENTRY glBlendEquation (GLe #ifndef GL_VERSION_1_5 #define GL_VERSION_1_5 1 #include --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif typedef ptrdiff_t GLintptr; #define GL_BUFFER_SIZE 0x8764 #define GL_BUFFER_USAGE 0x8765 -Index: VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h -@@ -3708,7 +3708,7 @@ typedef char GLchar; /* native charact +--- VirtualBox-6.0.6.orig/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/Additions/x11/x11include/mesa-7.2/GL/glext.h +@@ -3708,7 +3708,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +Index: VirtualBox-6.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -+++ VirtualBox-6.0.4/src/VBox/Devices/Graphics/vmsvga_glext/glext.h -@@ -6194,7 +6194,7 @@ typedef char GLchar; +--- VirtualBox-6.0.6.orig/src/VBox/Devices/Graphics/vmsvga_glext/glext.h ++++ VirtualBox-6.0.6/src/VBox/Devices/Graphics/vmsvga_glext/glext.h +@@ -6194,7 +6194,11 @@ typedef char GLchar; #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h +Index: VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/GL/glext.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h -+++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/GL/glext.h -@@ -3717,7 +3717,7 @@ typedef char GLchar; /* native charact +--- VirtualBox-6.0.6.orig/src/VBox/GuestHost/OpenGL/include/GL/glext.h ++++ VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/GL/glext.h +@@ -3717,7 +3717,11 @@ typedef char GLchar; /* native charact #ifndef GL_VERSION_1_5 /* GL types for handling large vertex buffer objects */ typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif #endif #ifndef GL_ARB_vertex_buffer_object -Index: VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h +Index: VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/chromium.h =================================================================== ---- VirtualBox-6.0.4.orig/src/VBox/GuestHost/OpenGL/include/chromium.h -+++ VirtualBox-6.0.4/src/VBox/GuestHost/OpenGL/include/chromium.h -@@ -499,7 +499,7 @@ PROC WINAPI wglGetProcAddress_prox( LPCS +--- VirtualBox-6.0.6.orig/src/VBox/GuestHost/OpenGL/include/chromium.h ++++ VirtualBox-6.0.6/src/VBox/GuestHost/OpenGL/include/chromium.h +@@ -506,7 +506,11 @@ PROC WINAPI wglGetProcAddress_prox( LPCS #ifndef GL_VERSION_1_5 typedef ptrdiff_t GLintptr; --typedef ptrdiff_t GLsizeiptr; ++#if __BITS_PER_LONG != 64 + typedef ptrdiff_t GLsizeiptr; ++#else +typedef long int GLsizeiptr; ++#endif /* prototype these functions for opengl_stub/getprocaddress.c */ extern void APIENTRY glGenQueries(GLsizei n, GLuint *ids); diff --git a/virtualbox.changes b/virtualbox.changes index b97a82b..e3c2c1e 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Thu May 16 17:50:44 UTC 2019 - Larry Finger + +- Version bump to 6.0.8 (released May 13 2019 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + +Core: fix saved state resume failures (bugs #18265 and #18331) +User interface: show full file location in New Medium window. +User interface: fix mouse click pass-through problems in multi-screen virtual machines (6.0.6 regression, bug #18567) +Graphics: fixed a crash when powering off a VM without graphics controller (bug #18570) +API: partial fix for dealing with VM config conflicting with other VMs related to medium UUIDs, now correctly flags VM as inaccessible (bug #17908) +Linux hosts: fix kernel module build breakage in non-default build set-ups (bug #18620, thank you Ambroz Bizjak) +Linux hosts: fix kernel module build breakage in debug build set-ups (bug #18621, thank you Ambroz Bizjak) +Windows guests: notice file size increases in shared folders which were missed in certain cases +Linux guests: make shared folders work with Linux 3.16.35 +Linux guests: fix incorrectly read-only shared folders (bug #18345) + +------------------------------------------------------------------- +Wed May 15 22:08:58 UTC 2019 - Larry Finger + +- Modify "fixes_for_qt13.1" for i586 builds qith Qt 5.13 + +------------------------------------------------------------------- +Tue Apr 30 22:50:12 UTC 2019 - Larry Finger + +- Limit all architectures to a maxium of 2 jobs. Without this restriction, 32-bit builds run + out of memory, and 64-bit builds get strange crashes. + +------------------------------------------------------------------- +Mon Apr 29 17:21:00 UTC 2019 - Larry Finger + +- LTO builds still failing. Reset flag to nil. + +- Changed the way that the spec file limits the 32-bit builds to 2 threads. boo#1133492. + If enough memory were allocated so that the full number of workers were allowed, the job would never be scheduled. + ------------------------------------------------------------------- Fri Apr 26 10:28:40 UTC 2019 - mvetter@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index e92e109..2306a52 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -38,11 +38,16 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile # Do not provide libGL.so symbols - they are owned by Mesa already and this could potentially confuse rpm/zypp %global __provides_exclude ^libE?GL.so.1.*$ +# With 32-bit builds, the job limit cannot be larger than 2, otherwise the build runs out of memory. +# For 64-bit builds, no memory limit is reached when more jobs are run, but the builds crash with strange errors. +# For the above reasons, limit the number of jobs to 2. +%define _smp_mflags -j2 + %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir /usr/lib/udev/rules.d Name: virtualbox # ********* If the VB version exceeds 6.0.x, notify the libvirt maintainer!! -Version: 6.0.6 +Version: 6.0.8 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0-or-later @@ -438,7 +443,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch128 -p1 %patch129 -p1 -%if %{qt5ver} >= 51300 +%if %{qt5ver} >= 51300 %patch131 -p1 %endif %patch999 -p1 @@ -470,6 +475,7 @@ echo "SED = $RPM_BUILD_DIR/VirtualBox-%{version}/kmk_sed" >> LocalConfig.kmk # %build +# Disable LTO - Link Time Optimization %define _lto_cflags %{nil} #ensure we don't ever use them rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*} @@ -494,8 +500,7 @@ source ./env.sh # VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file # VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui echo "build basic parts" -# To keep memory requirements within bounds, limit make to 2 jobs - %{_bindir}/kmk -j2 \ + %{_bindir}/kmk %_smp_mflags \ VBOX_GCC_WERR= \ KBUILD_VERBOSE=2 \ VBOX_USE_SYSTEM_XORG_HEADERS=1 \ From cbf52ea5f0d7f2347c2f293c67651441a5239f73a01af97fb3b22cb948fcfebf Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 29 May 2019 14:36:37 +0000 Subject: [PATCH 2/4] Accepting request 706136 from home:frispete:kernel Hi Larry, here we go.. this version of VB is tested successfully with TW and 15.0, builds with 42.3, 15.0, 15.0 with Kernel:stable, 15.1, TW, and behaves properly autostart-wise. So it's good to go from my POV. Cheers, Pete - separate vboxautostart.sh from vboxdrv.sh - add vboxautostart.service - clean up vboxdrv.sh - fix build of vboxvideo kernel module by replacing the relative drm include patch with an absolute include path (with sed) - build vboxvideo kernel module for openSUSE >= 15.0 - apply fixes_for_Leap15.1.patch conditionally only - add minimal patch fixes_for_Leap42.3.patch to build for 42.3 - fix path typo: %{_datadir}/pixmaps/virtalbox -> %{_datadir}/pixmaps/virtualbox OBS-URL: https://build.opensuse.org/request/show/706136 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=489 --- fixes_for_Leap42.3.patch | 13 ++++ vboxautostart.service | 18 ++++++ vboxautostart.sh | 126 +++++++++++++++++++++++++++++++++++++ vboxdrv.sh | 66 ------------------- virtualbox-guest-kmp-files | 2 +- virtualbox.changes | 14 +++++ virtualbox.spec | 62 +++++++++++++----- 7 files changed, 218 insertions(+), 83 deletions(-) create mode 100644 fixes_for_Leap42.3.patch create mode 100644 vboxautostart.service create mode 100644 vboxautostart.sh diff --git a/fixes_for_Leap42.3.patch b/fixes_for_Leap42.3.patch new file mode 100644 index 0000000..6297619 --- /dev/null +++ b/fixes_for_Leap42.3.patch @@ -0,0 +1,13 @@ +Index: b/src/VBox/Additions/linux/sharedfolders/regops.c +=================================================================== +--- a/src/VBox/Additions/linux/sharedfolders/regops.c ++++ b/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -1436,7 +1436,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin + # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) + ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages); + # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 168) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +- ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, papPages, ++ ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, papPages, + fWrite ? FOLL_WRITE | FOLL_FORCE : FOLL_FORCE); + # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) + ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, fWrite, 1 /*force*/, papPages); diff --git a/vboxautostart.service b/vboxautostart.service new file mode 100644 index 0000000..ef98c3e --- /dev/null +++ b/vboxautostart.service @@ -0,0 +1,18 @@ +[Unit] +SourcePath=/usr/lib/virtualbox/vboxautostart.sh +Description=VirtualBox Linux autostart module +Requires=vboxdrv.service +After=vboxdrv.service +After=network.target +After=time-sync.target +After=nss-user-lookup.target + +[Service] +ExecStart=/usr/lib/virtualbox/vboxautostart.sh start +ExecStop=/usr/lib/virtualbox/vboxautostart.sh stop +Type=oneshot +RemainAfterExit=yes +TimeoutStopSec=0 + +[Install] +WantedBy=multi-user.target diff --git a/vboxautostart.sh b/vboxautostart.sh new file mode 100644 index 0000000..4079cfb --- /dev/null +++ b/vboxautostart.sh @@ -0,0 +1,126 @@ +#!/bin/sh +# VirtualBox autostart service init script. + +# +# Copyright (C) 2012-2019 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +# chkconfig: 345 35 65 +# description: VirtualBox autostart service +# +### BEGIN INIT INFO +# Provides: vboxautostart-service +# Required-Start: vboxdrv +# Required-Stop: vboxdrv +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Description: VirtualBox autostart service +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH +SCRIPTNAME=vboxautostart.sh + +# read vbox config +[ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg + +# read autostart config +[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox + +begin_msg() +{ + test -n "${2}" && echo "${SCRIPTNAME}: ${1}." + logger -t "${SCRIPTNAME}" "${1}." +} + +succ_msg() +{ + logger -t "${SCRIPTNAME}" "${1}." +} + +fail_msg() +{ + echo "${SCRIPTNAME}: failed: ${1}." >&2 + logger -t "${SCRIPTNAME}" "failed: ${1}." +} + +vboxdrvrunning() { + lsmod | grep -q "vboxdrv[^_-]" +} + +start_vms() +{ + OLD_IFS=$IFS + IFS=$'\n' + [ -z "$VBOXAUTOSTART_DB" ] && return + [ -z "$VBOXAUTOSTART_CONFIG" ] && return + begin_msg "Starting VirtualBox VMs configured for autostart" console; + vboxdrvrunning || { + fail_msg "VirtualBox kernel module not loaded!" + exit 0 + } + # read autostart config file + if [ -r $VBOXAUTOSTART_CONFIG ]; then + # prevent inheriting this setting to VBoxSVC + unset VBOX_RELEASE_LOG_DEST + # find all the files of type username.start + var=$(ls $VBOXAUTOSTART_DB | grep start | grep -v auto) + # process each file of that type + for i in $var; do + # Extract the user name - the first word on the line + user=$(echo $i | head -n1 | cut -d "." -f1) + # autostart the VMs for that user + begin_msg "Starting VMs for user $user" console + su - $user -c "/usr/lib/virtualbox/VBoxAutostart --start --config $VBOXAUTOSTART_CONFIG" + succ_msg "VMs for user $user started" + done + fi + IFS=$OLD_IFS +} + +stop_vms() +{ + OLD_IFS=$IFS + IFS=$'\n' + [ -z "$VBOXAUTOSTART_DB" ] && return + [ -z "$VBOXAUTOSTART_CONFIG" ] && return + # read autostart config file + if [ -r $VBOXAUTOSTART_CONFIG ]; then + # prevent inheriting this setting to VBoxSVC + unset VBOX_RELEASE_LOG_DEST + # find all the files of type username.stop + var=$(ls $VBOXAUTOSTART_DB | grep stop | grep -v auto) + # process each file of that type + for i in $var; do + # Extract the user name - the first word on the line + user=$(echo $i | head -n1 | cut -d "." -f1) + # autostop the VMs for that user + begin_msg "Stopping VMs for user $user" console + su - $user -c "/usr/lib/virtualbox/VBoxAutostart --stop --config $VBOXAUTOSTART_CONFIG" + succ_msg "VMs for user $user stopped" + done + fi + IFS=$OLD_IFS +} + + +case "$1" in +start) + start_vms + ;; +stop) + stop_vms + ;; +*) + echo "Usage: $0 {start|stop}" + exit 1 +esac + +exit 0 diff --git a/vboxdrv.sh b/vboxdrv.sh index ad08572..b47e78f 100644 --- a/vboxdrv.sh +++ b/vboxdrv.sh @@ -27,12 +27,6 @@ # Description: VirtualBox Linux kernel module ### END INIT INFO -## @todo This file duplicates a lot of script with vboxadd.sh. When making -# changes please try to reduce differences between the two wherever possible. - -## @todo Remove the stop_vms target so that this script is only relevant to -# kernel modules. Nice but not urgent. - PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH DEVICE=/dev/vboxdrv LOG="/var/log/vbox-install.log" @@ -66,11 +60,6 @@ fi [ -r /etc/default/virtualbox ] && . /etc/default/virtualbox -# Preamble for Gentoo -if [ "`which $0`" = "/sbin/rc" ]; then - shift -fi - begin_msg() { test -n "${2}" && echo "${SCRIPTNAME}: ${1}." @@ -297,56 +286,6 @@ stop_drv() succ_msg "VirtualBox services stopped" } -stop_vms() -{ -OLD_IFS=$IFS -IFS=$'\n' -# read config file -[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox -[ -z "$VBOXAUTOSTART_DB" ] && return -[ -z "$VBOXAUTOSTART_CONFIG" ] && return -# read autostart config file -if [ -r $VBOXAUTOSTART_CONFIG ]; then -# find all the files of type username.stop - var=$(ls $VBOXAUTOSTART_DB | grep stop | grep -v auto) -# process each file of that type - for i in $var; do -# Extract the user name - the first word on the line - user=$(echo $i | head -n1 | cut -d "." -f1) -# autostop the VMs for that user - begin_msg "Stopping VMs for user $user" console - su - $user -c "/usr/lib/virtualbox/VBoxAutostart --stop --config $VBOXAUTOSTART_CONFIG" - succ_msg "VMs for user $user stopped" - done -fi -IFS=$OLD_IFS -} - -start_vms() -{ -OLD_IFS=$IFS -IFS=$'\n' -# read config file -[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox -[ -z "$VBOXAUTOSTART_DB" ] && return -[ -z "$VBOXAUTOSTART_CONFIG" ] && return -# read autostart config file -if [ -r $VBOXAUTOSTART_CONFIG ]; then -# find all the files of type username.start - var=$(ls $VBOXAUTOSTART_DB | grep start | grep -v auto) -# process each file of that type - for i in $var; do -# Extract the user name - the first word on the line - user=$(echo $i | head -n1 | cut -d "." -f1) -# autostart the VMs for that user - begin_msg "Starting VMs for user $user" console - su - $user -c "/usr/lib/virtualbox/VBoxAutostart --start --config $VBOXAUTOSTART_CONFIG" - succ_msg "VMs for user $user started" - done -fi -IFS=$OLD_IFS -} - cleanup_vb() { for i in /lib/modules/*; do @@ -410,15 +349,10 @@ dmnstatus() case "$1" in start) start_drv - start_vms ;; stop) - stop_vms stop_drv ;; -stop_vms) - stop_vms - ;; restart) "$0" stop && "$0" start ;; diff --git a/virtualbox-guest-kmp-files b/virtualbox-guest-kmp-files index 8bfb885..b5ac415 100644 --- a/virtualbox-guest-kmp-files +++ b/virtualbox-guest-kmp-files @@ -3,6 +3,6 @@ %dir /lib/modules/%2-%1/extra /lib/modules/%2-%1/extra/vboxsf.ko /lib/modules/%2-%1/extra/vboxguest.ko -%if 0%{?suse_version} == 1500 +%if 0%{?suse_version} >= 1500 /lib/modules/%2-%1/extra/vboxvideo.ko %endif diff --git a/virtualbox.changes b/virtualbox.changes index e3c2c1e..056ca80 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon May 27 09:07:45 UTC 2019 - Hans-Peter Jansen + +- separate vboxautostart.sh from vboxdrv.sh +- add vboxautostart.service +- clean up vboxdrv.sh +- fix build of vboxvideo kernel module by replacing the relative + drm include patch with an absolute include path (with sed) +- build vboxvideo kernel module for openSUSE >= 15.0 +- apply fixes_for_Leap15.1.patch conditionally only +- add minimal patch fixes_for_Leap42.3.patch to build for 42.3 +- fix path typo: %{_datadir}/pixmaps/virtalbox + -> %{_datadir}/pixmaps/virtualbox + ------------------------------------------------------------------- Thu May 16 17:50:44 UTC 2019 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 2306a52..18ac7b3 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -78,6 +78,8 @@ Source19: vboxdrv.sh Source20: README.autostart Source21: vboxweb-service.service Source22: vboxweb-service.sh +Source23: vboxautostart.service +Source24: vboxautostart.sh Source98: %{name}-rpmlintrc Source99: %{name}-patch-source.sh #rework init scripts to fit suse needs @@ -139,6 +141,8 @@ Patch125: remove_vbox_video_build.patch Patch128: fix_lib_search.patch # Fixes for modified kernel in Leap 15.1 Patch129: fixes_for_Leap15.1.patch +# Fixes for modified kernel in Leap 42.3 +Patch130: fixes_for_Leap42.3.patch # Fixes for Qt5.13 Patch131: fixes_for_qt5.13.patch #endif @@ -441,11 +445,19 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch123 -p1 %patch125 -p1 %patch128 -p1 +# Tumbleweed, Leap 15.1 and above drm adjustments +%if 0%{?suse_version} > 1500 || (0%{?sle_version} >= 150100 && 0%{?is_opensuse}) %patch129 -p1 - -%if %{qt5ver} >= 51300 +%endif +# Leap 42.3 adjustments +%if 0%{?sle_version} == 120300 && 0%{?is_opensuse} +%patch130 -p1 +%endif +# Qt5.13 adjustments +%if %{qt5ver} >= 51300 %patch131 -p1 %endif +# make VB UI background colors look sane again %patch999 -p1 #copy user manual @@ -473,6 +485,8 @@ echo "SED = $RPM_BUILD_DIR/VirtualBox-%{version}/kmk_sed" >> LocalConfig.kmk ####workaround kmk_sed --^ ########################## # +# fix build of vboxvideo kernel module: replace relative drm include path with absolute include path +sed -i 's:include/drm:/usr/src/linux/include/drm:' src/VBox/Additions/linux/drm/Makefile.module.kms %build # Disable LTO - Link Time Optimization @@ -525,7 +539,7 @@ install -D -m 644 "COPYING" "%{buildroot}%{_datadir}/licenses/LICENSE.vnc" # host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci # guest modules : vboxguest,vboxsf vboxvideo (for Leap 15.1) echo "build kernel modules" -%if 0%{?suse_version} == 1500 +%if 0%{?suse_version} >= 1500 for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do %else @@ -553,14 +567,15 @@ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ cp $PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers \ $PWD/modules_build_dir/$flavor/$module_name fi - # copy vboxguest (for guest) module symbols which are used by vboxsf km: - if [ "$module_name" = "vboxsf" ]; then + # copy vboxguest (for guest) module symbols which are used by vboxsf and vboxvideo km's: + if [ "$module_name" = "vboxsf" -o \ + "$module_name" = "vboxvideo" ] ; then cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ $PWD/modules_build_dir/$flavor/$module_name fi # build the module for the specific flavor make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?linux_make_arch} modules \ - M=$PWD/modules_build_dir/$flavor/$module_name + M=$PWD/modules_build_dir/$flavor/$module_name V=1 done done @@ -597,7 +612,7 @@ export INSTALL_MOD_DIR=extra export INITRD_IN_POSTTRANS=1 export KMP_NEEDS_MKINITRD=0 #to install modules we use here similar steps like in build phase, go through all the modules : -%if 0%{?suse_version} == 1500 +%if 0%{?suse_version} >= 1500 for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video} %else for module_name in vbox{drv,netflt,pci,netadp,guest,sf} @@ -712,13 +727,18 @@ install -m 0755 %{SOURCE18} %{buildroot}/sbin/vbox-fix-usb-rules.sh install -m 0755 %{SOURCE19} %{buildroot}%{_vbox_instdir}/vboxdrv.sh install -m 0644 %{SOURCE21} %{buildroot}%{_unitdir}/vboxweb-service.service install -m 0755 %{SOURCE22} %{buildroot}%{_vbox_instdir}/vboxweb-service.sh -# Init script to start virtual boxes during boot +install -m 0644 %{SOURCE23} %{buildroot}%{_unitdir}/vboxautostart.service +ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcvboxautostart +install -m 0755 %{SOURCE24} %{buildroot}%{_vbox_instdir}/vboxautostart.sh +# Init scripts to start virtualbox during boot ln -sf %{_unitdir}/vboxdrv.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxdrv.service ln -sf %{_unitdir}/vboxadd-service.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxadd-service.service +ln -sf %{_unitdir}/vboxautostart.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxautostart.service -# config file for vboxdrv script and vboxweb +# config file for vboxdrv and vboxweb install -d -m 755 %{buildroot}%{_sysconfdir}/vbox echo -e "#settings for vboxwebsrn\nVBOXWEB_USER=root" > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg +# config file for vboxautostart cat > %{buildroot}%{_sysconfdir}/vbox/autostart.cfg << EOF default_policy = deny # Create an entry for each user allowed to use autostart @@ -764,11 +784,11 @@ popd ###################################################### echo "entering virtualbox-guest-desktop-icons install section" ###################################################### -install -d -m 755 %{buildroot}%{_datadir}/pixmaps/virtalbox +install -d -m 755 %{buildroot}%{_datadir}/pixmaps/virtualbox pushd src/VBox/Frontends/VirtualBox/images for icon in os_*.png; do - install -m 644 "$icon" %{buildroot}%{_datadir}/pixmaps/virtalbox/"$icon"; + install -m 644 "$icon" %{buildroot}%{_datadir}/pixmaps/virtualbox/"$icon"; done popd # @@ -780,7 +800,7 @@ popd #also some translation files are duplicated %fdupes %{buildroot}/%{_datadir}/virtualbox/nls #also some icon files are duplicated -%fdupes %{buildroot}/%{_datadir}/pixmaps/virtalbox +%fdupes %{buildroot}/%{_datadir}/pixmaps/virtualbox # # @@ -791,12 +811,13 @@ popd %pre getent group vboxusers >/dev/null || groupadd -r vboxusers %service_add_pre vboxdrv.service +%service_add_pre vboxautostart.service %pre guest-tools # Add groups for seamless mode and shared folders: getent group vboxguest >/dev/null || groupadd -r vboxguest getent group vboxsf >/dev/null || groupadd -r vboxsf -%if 0%{?suse_version} == 1500 +%if 0%{?suse_version} >= 1500 getent group vboxvideo >/dev/null || groupadd -r vboxvideo %endif %service_add_pre vboxadd-service.service @@ -816,6 +837,7 @@ getent group vboxvideo >/dev/null || groupadd -r vboxvideo %set_permissions %{_vbox_instdir}/VBoxNetAdpCtl %set_permissions %{_vbox_instdir}/VBoxHeadless %service_add_post vboxdrv.service +%service_add_post vboxautostart.service # add new autostart stuff to the existing default config, if missing grep -q VBOXAUTOSTART /etc/default/virtualbox || { cat >> /etc/default/virtualbox << EOF @@ -859,7 +881,9 @@ VBoxManage extpack install --replace "${EXTPACK}" --accept-license="${ACCEPT}" > ####################################################### %preun +%stop_on_removal vboxautostart %stop_on_removal vboxdrv +%service_del_preun vboxautostart.service %service_del_preun vboxdrv.service exit 0 @@ -881,8 +905,10 @@ exit 0 %postun /sbin/ldconfig %restart_on_update vboxdrv +%restart_on_update vboxautostart # immediately restarting virtualbox may not work. As such wait for the next reboot to restart export DISABLE_RESTART_ON_UPDATE=yes +%service_del_postun vboxautostart.service %service_del_postun vboxdrv.service %postun guest-tools @@ -952,9 +978,13 @@ export DISABLE_RESTART_ON_UPDATE=yes %dir %{_unitdir} %dir %{_unitdir}/multi-user.target.wants /usr/lib/virtualbox/vboxdrv.sh +/usr/lib/virtualbox/vboxautostart.sh %{_unitdir}/vboxdrv.service +%{_unitdir}/vboxautostart.service %{_unitdir}/multi-user.target.wants/vboxdrv.service +%{_unitdir}/multi-user.target.wants/vboxautostart.service %{_sbindir}/rcvboxdrv +%{_sbindir}/rcvboxautostart /sbin/vboxconfig %{_vbox_instdir}/VBoxCreateUSBNode.sh %verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT @@ -1064,8 +1094,8 @@ export DISABLE_RESTART_ON_UPDATE=yes %files guest-desktop-icons %defattr(-,root, root) -%dir %{_datadir}/pixmaps/virtalbox -%{_datadir}/pixmaps/virtalbox/*.png +%dir %{_datadir}/pixmaps/virtualbox +%{_datadir}/pixmaps/virtualbox/*.png %files vnc %defattr(-,root, root) From bf8361d4496b59b2f7d490f3cc0bf70dfe788eceb6dd766c349d7cc6af527c29 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 29 May 2019 14:39:08 +0000 Subject: [PATCH 3/4] Accepting request 705727 from home:lwfinger:branches:openSUSE:Factory - Unused file "fix_LTO_builds.patch" removed. OBS-URL: https://build.opensuse.org/request/show/705727 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=490 --- fix_LTO_builds.patch | 13 ------------- virtualbox.changes | 5 +++++ 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 fix_LTO_builds.patch diff --git a/fix_LTO_builds.patch b/fix_LTO_builds.patch deleted file mode 100644 index 419f68e..0000000 --- a/fix_LTO_builds.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: VirtualBox-6.0.6/Config.kmk -=================================================================== ---- VirtualBox-6.0.6.orig/Config.kmk -+++ VirtualBox-6.0.6/Config.kmk -@@ -21,6 +21,8 @@ - # Marker. - VBOX_ROOT_CONFIG_KMK_INCLUDED = 1 - -+# Turn off mangling for Link Time Option -+IPRT_IGNORE_TEST_MANGLING = 1 - - # - # kBuild stuff diff --git a/virtualbox.changes b/virtualbox.changes index 056ca80..ac2e2a2 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 28 03:58:33 UTC 2019 - Larry Finger + +- Unused file "fix_LTO_builds.patch" removed. + ------------------------------------------------------------------- Mon May 27 09:07:45 UTC 2019 - Hans-Peter Jansen From a92ea7b15a232e78f732035897b0aa7aaaad5d6d727f2e026016fc88ac05908b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 1 Jun 2019 20:27:45 +0000 Subject: [PATCH 4/4] Accepting request 706522 from home:lwfinger:branches:openSUSE:Factory - Kernel 5.2, now in Kernel_HEAD_stardard, has some API changes. These are handled in the new file "fixes_for_5.2.patch". OBS-URL: https://build.opensuse.org/request/show/706522 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=491 --- fixes_for_5.2.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++ virtualbox.changes | 6 ++++++ virtualbox.spec | 3 +++ 3 files changed, 56 insertions(+) create mode 100644 fixes_for_5.2.patch diff --git a/fixes_for_5.2.patch b/fixes_for_5.2.patch new file mode 100644 index 0000000..4866c7e --- /dev/null +++ b/fixes_for_5.2.patch @@ -0,0 +1,47 @@ +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 ++++ VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_fb.c +@@ -335,13 +335,17 @@ static int vboxfb_create(struct drm_fb_h + info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); + info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0); + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) ++ drm_fb_helper_fill_info(info, &fbdev->helper, sizes); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75) + drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); + #else + drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth); + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width, + sizes->fb_height); ++#endif + + info->screen_base = bo->kmap.virtual; + info->screen_size = size; +Index: VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c +=================================================================== +--- VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -298,7 +298,6 @@ int vbox_mm_init(struct vbox_private *vb + if (ret) + return ret; + #endif +- + ret = ttm_bo_device_init(&vbox->ttm.bdev, + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) + vbox->ttm.bo_global_ref.ref.object, +@@ -307,7 +306,11 @@ int vbox_mm_init(struct vbox_private *vb + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL_71) + dev->anon_inode->i_mapping, + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + DRM_FILE_PAGE_OFFSET, true); ++#else ++ true); ++#endif + if (ret) { + DRM_ERROR("Error initialising bo driver; %d\n", ret); + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) diff --git a/virtualbox.changes b/virtualbox.changes index ac2e2a2..31cc013 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 30 02:58:13 UTC 2019 - Larry Finger + +- Kernel 5.2, now in Kernel_HEAD_stardard, has some API changes. These are + handled in the new file "fixes_for_5.2.patch". + ------------------------------------------------------------------- Tue May 28 03:58:33 UTC 2019 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 18ac7b3..9829fb3 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -145,6 +145,8 @@ Patch129: fixes_for_Leap15.1.patch Patch130: fixes_for_Leap42.3.patch # Fixes for Qt5.13 Patch131: fixes_for_qt5.13.patch +# Fixes for kernel 5.2 +Patch132: fixes_for_5.2.patch #endif Patch999: virtualbox-fix-ui-background-color.patch # @@ -457,6 +459,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %if %{qt5ver} >= 51300 %patch131 -p1 %endif +%patch132 -p1 # make VB UI background colors look sane again %patch999 -p1