From d21b5733af49a1a287c58ac6e64e30e0ee2d69d3fbef28ba99c14a9662548bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 1 Sep 2016 12:30:21 +0000 Subject: [PATCH 1/3] Accepting request 424220 from home:michal-m:branches:Virtualization - Update the host <-> guest KMP conflict dependencies to no longer refer to the old name (boo#983927). OBS-URL: https://build.opensuse.org/request/show/424220 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=270 --- virtualbox-guest-preamble | 2 +- virtualbox-host-preamble | 2 +- virtualbox.changes | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/virtualbox-guest-preamble b/virtualbox-guest-preamble index 42724b2..dc1b5c3 100644 --- a/virtualbox-guest-preamble +++ b/virtualbox-guest-preamble @@ -5,4 +5,4 @@ Provides: virtualbox-ose-guest-kmp-%1 = %version Obsoletes: virtualbox-ose-guest-kmp-%1 < %version #host (vboxdrv) and guest (vboxguest) kmp exports the same symbol (RTMemFreeEx) #which break loading modules using modprobe (bnc#661740) -Conflicts: virtualbox-ose-host-kmp +Conflicts: virtualbox-host-kmp diff --git a/virtualbox-host-preamble b/virtualbox-host-preamble index 1420a5e..35ddcbb 100644 --- a/virtualbox-host-preamble +++ b/virtualbox-host-preamble @@ -5,4 +5,4 @@ Provides: virtualbox-ose-host-kmp-%1 = %version Obsoletes: virtualbox-ose-host-kmp-%1 < %version #host (vboxdrv) and guest (vboxguest) kmp exports the same symbol (RTMemFreeEx) #which break loading modules using modprobe (bnc#661740) -Conflicts: virtualbox-ose-guest-kmp +Conflicts: virtualbox-guest-kmp diff --git a/virtualbox.changes b/virtualbox.changes index 9acbfe5..25219c1 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 1 11:54:43 UTC 2016 - mmarek@suse.cz + +- Update the host <-> guest KMP conflict dependencies to no longer + refer to the old name (boo#983927). + ------------------------------------------------------------------- Sun Aug 28 01:59:37 UTC 2016 - Larry.Finger@lwfinger.net From 8ed71a1239bfb4c5d2b38cb285c22dd5c9633485713814d88726f754b8dd919f Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 2 Sep 2016 20:42:33 +0000 Subject: [PATCH 2/3] Accepting request 424529 from home:wolfi323:branches:Virtualization - Re-added missing copy of Module.symvers from vboxguest build so that loads of vboxvideo can resolve all symbols, this got lost somehow (boo983091, boo#993736) OBS-URL: https://build.opensuse.org/request/show/424529 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=271 --- virtualbox.changes | 7 +++++++ virtualbox.spec | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/virtualbox.changes b/virtualbox.changes index 25219c1..4f83aca 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 2 20:26:22 UTC 2016 - wbauer@tmo.at + +- Re-added missing copy of Module.symvers from vboxguest build so + that loads of vboxvideo can resolve all symbols, this got lost + somehow (boo983091, boo#993736) + ------------------------------------------------------------------- Thu Sep 1 11:54:43 UTC 2016 - mmarek@suse.cz diff --git a/virtualbox.spec b/virtualbox.spec index 31fa671..787ef2f 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -416,6 +416,11 @@ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ $PWD/modules_build_dir/$flavor/$module_name fi + # copy vboxguest (for guest) module symbols which are used by vboxvideo km: + if [ "$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 %ifarch %ix86 make -j2 \ From 022a20a7aabf6f465dbd0c5696a9eac8a218e01fc1362b64eacdc0b5992f2652 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 2 Sep 2016 22:08:25 +0000 Subject: [PATCH 3/3] Accepting request 424543 from home:wolfi323:branches:Virtualization wrong bug numbers, sorry... OBS-URL: https://build.opensuse.org/request/show/424543 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=272 --- virtualbox.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtualbox.changes b/virtualbox.changes index 4f83aca..aa5774c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -3,7 +3,7 @@ Fri Sep 2 20:26:22 UTC 2016 - wbauer@tmo.at - Re-added missing copy of Module.symvers from vboxguest build so that loads of vboxvideo can resolve all symbols, this got lost - somehow (boo983091, boo#993736) + somehow (boo#983927, boo#993091) ------------------------------------------------------------------- Thu Sep 1 11:54:43 UTC 2016 - mmarek@suse.cz