Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2017-11-30 12:37:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox" Thu Nov 30 12:37:53 2017 rev:148 rq:544927 version:5.1.30 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2017-11-14 14:20:20.324797830 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2017-11-30 12:37:58.198108497 +0100 @@ -1,0 +2,13 @@ +Thu Nov 23 13:47:36 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Wed Nov 22 16:39:22 UTC 2017 - [email protected] + +- 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. + +------------------------------------------------------------------- Old: ---- fix_KMS_support.patch New: ---- fixes_for_4.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.9EEm5W/_old 2017-11-30 12:38:02.077967414 +0100 +++ /var/tmp/diff_new_pack.9EEm5W/_new 2017-11-30 12:38:02.081967268 +0100 @@ -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 @@ 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 @@ %else BuildRequires: boost-devel %endif +BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: dev86 BuildRequires: device-mapper-devel BuildRequires: dmidecode @@ -135,7 +141,7 @@ 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 @@ %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 @@ 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 @@ 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}/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 @@ %{_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 ++++++ fixes_for_4.15.patch ++++++ 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); ++++++ vboxconfig.sh ++++++ --- /var/tmp/diff_new_pack.9EEm5W/_old 2017-11-30 12:38:02.361957088 +0100 +++ /var/tmp/diff_new_pack.9EEm5W/_new 2017-11-30 12:38:02.361957088 +0100 @@ -21,16 +21,14 @@ # 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
