From 4bac402b42e3afbb85b8d647901b770574ab69c71def17cb27d09c16d87286f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 31 Aug 2016 07:26:51 +0000 Subject: [PATCH] Accepting request 423472 from home:lwfinger:branches:Virtualization Fix missing ExclusiveArch directive OBS-URL: https://build.opensuse.org/request/show/423472 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=268 --- modify_for_4_8_bo_move.patch | 21 +++++++++++++++++++++ virtualbox.changes | 6 ++++++ virtualbox.spec | 1 + 3 files changed, 28 insertions(+) diff --git a/modify_for_4_8_bo_move.patch b/modify_for_4_8_bo_move.patch index b268eb4..1d65508 100644 --- a/modify_for_4_8_bo_move.patch +++ b/modify_for_4_8_bo_move.patch @@ -33,3 +33,24 @@ Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c { struct vbox_private *vbox = dev->dev_private; vbox->initial_mode_queried = false; +Index: VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +=================================================================== +--- VirtualBox-5.1.4.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +@@ -35,7 +35,7 @@ + #include + #include + #include "r0drv/alloc-r0drv.h" +- ++#include + + #if (defined(RT_ARCH_AMD64) || defined(DOXYGEN_RUNNING)) && !defined(RTMEMALLOC_EXEC_HEAP) + # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23) +@@ -294,6 +294,7 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb + fFlags &= ~RTMEMHDR_FLAG_KMALLOC; + pHdr = vmalloc(cb + sizeof(*pHdr)); + } ++ kmemleak_not_leak(pHdr); + } + else + pHdr = vmalloc(cb + sizeof(*pHdr)); diff --git a/virtualbox.changes b/virtualbox.changes index f411416..9acbfe5 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Aug 28 01:59:37 UTC 2016 - Larry.Finger@lwfinger.net + +- Add "ExclusiveArch: %ix86 x86_64" line back into the spec file. + Handle a false positive indication from kmemleak. This patch is added to "modify_for_4_8_bo_move.patch". + ------------------------------------------------------------------- Thu Aug 18 20:24:23 UTC 2016 - Larry.Finger@lwfinger.net diff --git a/virtualbox.spec b/virtualbox.spec index 9df060a..31fa671 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -158,6 +158,7 @@ Provides: %{name}-ose = %{version} Obsoletes: %{name}-ose < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) +ExclusiveArch: %ix86 x86_64 %ifarch amd64 x86_64 ia32e em64t BuildRequires: gcc-32bit BuildRequires: gcc-c++-32bit