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

Accepting request 544927 from Virtualization

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) (forwarded request 544759 from RBrownSUSE)

OBS-URL: https://build.opensuse.org/request/show/544927
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=148
This commit is contained in:
Dominique Leuenberger 2017-11-30 11:37:53 +00:00 committed by Git OBS Bridge
commit 400e0970e1
5 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fix_KMS_support.patch
View File

@ -1,14 +0,0 @@
Index: VirtualBox-5.1.22/src/VBox/Additions/linux/drm/vbox_fb.c
===================================================================
--- VirtualBox-5.1.22.orig/src/VBox/Additions/linux/drm/vbox_fb.c
+++ VirtualBox-5.1.22/src/VBox/Additions/linux/drm/vbox_fb.c
@@ -409,6 +409,9 @@ static void vbox_fbdev_destroy(struct dr
LogFunc(("vboxvideo: %d\n", __LINE__));
if (fbdev->helper.fbdev) {
info = fbdev->helper.fbdev;
+#ifdef CONFIG_FB_DEFERRED_IO
+ fb_deferred_io_cleanup(info);
+#endif
unregister_framebuffer(info);
if (info->cmap.len)
fb_dealloc_cmap(&info->cmap);

15
fixes_for_4.15.patch Normal file
View File

@ -0,0 +1,15 @@
Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
===================================================================
--- VirtualBox-5.1.30.orig/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
+++ VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
@@ -1584,7 +1584,9 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *pp
else
#endif
{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+ __init_timer(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer, TIMER_PINNED);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)
init_timer_pinned(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer);
#else
init_timer(&pTimer->aSubTimers[iCpu].u.Std.LnxTimer);

8
vboxconfig.sh
View File

@ -21,16 +21,14 @@ fi
# Check if virtualbox-host-source is installed, quit if not
if ! rpm -qf "$SOURCE/Makefile" &>/dev/null ; then
echo "Sources for building host modules are not present,"
echo "Use 'sudo zypper install virtualbox-host-source' to install them. Quitting .."
echo "Use 'sudo zypper install virtualbox-host-source kernel_devel' to install them. Quitting .."
exit 1
fi
#
# Check if virtualbox-host-source version matches virtualbox version
if [ "$(rpm -q virtualbox virtualbox-host-source --queryformat='%{version}-%{release}\n' 2>/dev/null | sort -u | wc -l)" -ne "1" ] ; then
echo "virtualbox-host-source package version doesn't match"
echo "the version of virtualbox package."
echo "Reinstall virtualbox-host-source package. Quitting .."
exit 1
echo "virtualbox-host-source package version doesn't match the version of virtualbox package."
echo "This situation is probably not fatal, thus we will try to continue .."
fi
# Prerequisites are available, start build
pushd $SOURCE > /dev/null 2>&1

13
virtualbox.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Nov 23 13:47:36 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Wed Nov 22 16:39:22 UTC 2017 - Larry.Finger@lwfinger.net
- Remove file "fix_KMS_support.patch" - Fixed upstream
Add new patch file "fixes_for_4.15.patch".
Modified vboxconfig.sh to issue a warning when there is a version mismatch rather than abort.
-------------------------------------------------------------------
Sat Nov 11 03:40:07 UTC 2017 - Larry.Finger@lwfinger.net

26
virtualbox.spec
View File

@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
# 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.*$
@ -103,8 +108,8 @@ Patch114: fixes_for_4.14.patch
Patch115: vbox_fix_for_gcc7.patch
# Fix for missing include needed for server 1.19
Patch116: Fix_for_server_1.19.patch
# Fix for missing cleanup in KMS support
Patch117: fix_KMS_support.patch
# Fix for removal of init_timer_pinned() in kernel 4.15
Patch117: fixes_for_4.15.patch
# Fix invalid use of internal headers
Patch118: internal-headers.patch
# Fix kernl API change in Leap 15
@ -124,6 +129,7 @@ BuildRequires: libboost_headers-devel
%else
BuildRequires: boost-devel
%endif
BuildRequires: %{kernel_module_package_buildreqs}
BuildRequires: dev86
BuildRequires: device-mapper-devel
BuildRequires: dmidecode
@ -135,7 +141,7 @@ BuildRequires: glibc-devel-static
BuildRequires: gsoap-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: kbuild >= 0.1.9998svn2808
BuildRequires: kernel-syms
#BuildRequires: kernel-syms
BuildRequires: libcap-devel
BuildRequires: libcurl-devel
BuildRequires: libelf-devel
@ -244,9 +250,9 @@ websrv GUI part for %{name}.
%package host-KMP
Summary: Host kernel module for VirtualBox
#%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7} -n %{name}-host -f %{SOURCE5} -x kdump um xen pae xenpae pv
Group: System/Emulators/PC
%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE7} -n %{name}-host -f %{SOURCE5} -x kdump um xen pae xenpae pv
Requires: kernel-devel
Requires: %{kernel_module_package_buildreqs}
%description host-KMP
This package contains the kernel-module for VirtualBox.
@ -256,7 +262,7 @@ This package contains the kernel-module for VirtualBox.
Summary: Guest kernel modules for VirtualBox
Group: System/Emulators/PC
%kernel_module_package -t %{_builddir}/virtualbox-kmp-template -p %{SOURCE8} -n %{name}-guest -f %{SOURCE6} -x kdump um xen pae xenpae pv
Requires: kernel-devel
Requires: %{kernel_module_package_buildreqs}
%description guest-KMP
This package contains the kernel-module for VirtualBox.
@ -325,6 +331,8 @@ Summary: Source files for %{name} host kernel modules
Group: Development/Sources
Requires: %{name} = %{version}
Requires: gcc
Requires: kernel-devel
Requires: libelf-devel
Requires: make
BuildArch: noarch
@ -669,8 +677,8 @@ ln -sf %{_unitdir}/vboxdrv.service %{buildroot}%{_unitdir}/multi-user.target.wa
ln -sf %{_unitdir}/vboxadd-service.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxadd-service.service
ln -sf %{_unitdir}/vboxes.service %{buildroot}%{_unitdir}/multi-user.target.wants/vboxes.service
# sysconfig file intended for vboxes script
install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
install -m 640 %{SOURCE13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
install -d -m 755 %{buildroot}%{_fillupdir}
install -m 640 %{SOURCE13} %{buildroot}%{_fillupdir}/sysconfig.vbox
# config file for vboxdrv script and vboxweb
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
@ -893,7 +901,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%{_unitdir}/multi-user.target.wants/vboxes.service
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%{_var}/adm/fillup-templates/sysconfig.vbox
%{_fillupdir}/sysconfig.vbox
%{_sbindir}/rcvboxes
%{_sbindir}/rcvboxdrv
/sbin/vboxconfig