From 19c33a8c33dc8e0a25cd0c0b44b80f623e4e56de8d9574d1acecca672bb909f9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 17 Sep 2020 16:28:55 +0000 Subject: [PATCH 1/2] Accepting request 835129 from home:fbui:branches:Virtualization - Make use of %service_del_postun_without_restart And stop using DISABLE_RESTART_ON_UPDATE as this interface is obsolete. OBS-URL: https://build.opensuse.org/request/show/835129 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=573 --- virtualbox.changes | 8 ++++++++ virtualbox.spec | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index 8a9b62a..346e8f3 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 11 17:58:07 UTC 2020 - Franck Bui + +- Make use of %service_del_postun_without_restart + + And stop using DISABLE_RESTART_ON_UPDATE as this interface is + obsolete. + ------------------------------------------------------------------- Thu Sep 10 16:12:11 UTC 2020 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 9280920..c5a747d 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -899,9 +899,8 @@ exit 0 %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 +%service_del_postun_without_restart vboxautostart.service +%service_del_postun_without_restart vboxdrv.service %postun guest-tools %restart_on_update vboxadd From af28aadc8c3e86d2fcf25081b15a1be76f78c0edb8792c6fe1bc478b1c1454b2 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 18 Sep 2020 18:53:04 +0000 Subject: [PATCH 2/2] Accepting request 835468 from home:lwfinger:branches:Virtualization - %service_del_postun_without_restart is not yet available in Leap 15.{1,2} of SLE15_SP1. For that reason, a workaround is added. - Make use of %service_del_postun_without_restart And stop using DISABLE_RESTART_ON_UPDATE as this interface is obsolete. OBS-URL: https://build.opensuse.org/request/show/835468 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=574 --- virtualbox.changes | 6 ++++++ virtualbox.spec | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index 346e8f3..c8dcf10 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 18 16:36:31 UTC 2020 - Larry Finger + +- %service_del_postun_without_restart is not yet available in Leap 15.{1,2} of SLE15_SP1. + For that reason, a workaround is added. + ------------------------------------------------------------------- Fri Sep 11 17:58:07 UTC 2020 - Franck Bui diff --git a/virtualbox.spec b/virtualbox.spec index c5a747d..3d31954 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -543,7 +543,7 @@ echo "SED = $RPM_BUILD_DIR/VirtualBox-%{version}/kmk_sed" >> LocalConfig.kmk # 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, %install, and %file sections for virtualbox ### +### %%build, %%install, and %%file sections for virtualbox ### %if %{main_package} %build # Disable LTO - Link Time Optimization @@ -899,8 +899,14 @@ exit 0 %restart_on_update vboxdrv %restart_on_update vboxautostart # immediately restarting virtualbox may not work. As such wait for the next reboot to restart +%if ! %{defined service_del_postun_without_restart} +export DISABLE_RESTART_ON_UPDATE=yes +%service_del_postun vboxautostart.service +%service_del_postun vboxdrv.service +%else %service_del_postun_without_restart vboxautostart.service %service_del_postun_without_restart vboxdrv.service +%endif %postun guest-tools %restart_on_update vboxadd @@ -989,7 +995,7 @@ exit 0 %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSUIDMessage %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxUSB_DevRules %attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBox6 -%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM +%verify(not mode) %attr(0750,root,vboxusers) %{_vbox_instdir}/VirtualBoxVM %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxSDL %{_vbox_instdir}/VirtualBox #wrapper script is in bindir @@ -1091,7 +1097,7 @@ exit 0 # main_package %endif -### %build and %install sections of virtualbox-kmp ### +### %%build and %%install sections of virtualbox-kmp ### %if %{kmp_package} %build # Disable LTO - Link Time Optimization