commit 95f19bfad8ba4fed8fd1b250750f8b4ed54f0d5f Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Jun 13 06:39:37 2020 +0100 Syncronize with virtualbox-guest-additions from Fedora Add a vboxclient.service which runs VBoxClient --vwsvga when using the VMSVGA virtual GPU, this fixes resizing in wayland sessions (rhbz 1789545) Drop VBoxClient --vwsvga-x11 from VBoxClient-all, it is not necessary now that we run VBoxClient --vwsvga as service and it was breaking resize support with the VBoxSVGA virtual GPU (rhbz 1789545) Drop ExecStartPre modprove vboxvideo vboxsf from vboxservice.service, this is not necessary, they will be loaded automatically VirtualBox-5.2.10-xclient.patch | 9 ++++++--- VirtualBox-60-vboxguest.rules | 2 ++ VirtualBox.spec | 22 +++++++++++++++++++++- update_vbox.sh | 5 +++-- vboxclient.service | 8 ++++++++ 5 files changed, 40 insertions(+), 6 deletions(-) --- diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-5.2.10-xclient.patch index 920b569..308a8ee 100644 --- a/VirtualBox-5.2.10-xclient.patch +++ b/VirtualBox-5.2.10-xclient.patch @@ -1,6 +1,6 @@ ---- ./src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-05-14 19:33:50.000000000 +0100 -+++ ./src/VBox/Additions/x11/Installer/98vboxadd-xclient 2020-05-16 00:03:45.221363282 +0100 -@@ -21,15 +21,9 @@ for i in $HOME/.vboxclient-*.pid; do +--- ./src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-06-06 06:20:12.079227656 +0100 ++++ ./src/VBox/Additions/x11/Installer/98vboxadd-xclient 2020-06-06 06:26:55.886940895 +0100 +@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do test -w $i || rm -f $i done @@ -19,3 +19,6 @@ /usr/bin/VBoxClient --clipboard /usr/bin/VBoxClient --checkhostversion /usr/bin/VBoxClient --seamless + /usr/bin/VBoxClient --draganddrop +- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled + fi diff --git a/VirtualBox-60-vboxguest.rules b/VirtualBox-60-vboxguest.rules index 061eec0..d804611 100644 --- a/VirtualBox-60-vboxguest.rules +++ b/VirtualBox-60-vboxguest.rules @@ -1,2 +1,4 @@ KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxadd", MODE="0660" KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0666" + +ACTION=="add|change", SUBSYSTEM=="drm", KERNEL=="card[0-9]", SUBSYSTEMS=="pci", ATTRS{vendor}=="0x15ad", ATTRS{device}=="0x0405", TAG+="systemd", ENV{SYSTEMD_WANTS}="vboxclient.service" diff --git a/VirtualBox.spec b/VirtualBox.spec index 7744c21..9f8fa42 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -46,7 +46,7 @@ Name: VirtualBox Version: 6.1.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -63,6 +63,7 @@ Source2: VirtualBox.appdata.xml Source3: VirtualBox-60-vboxdrv.rules Source4: vboxdrv.service Source5: VirtualBox-60-vboxguest.rules +Source6: vboxclient.service Source7: vboxservice.service Source8: 96-vbox.preset Source9: 96-vbox-server.preset @@ -84,6 +85,9 @@ Patch40: 007-python2-path.patch Patch50: VirtualBox-5.1.0-add-Mageia-support.patch Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch # from Fedora +# Do not show an error dialog when not running under vbox +# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as +# a systemd service, this works with both Wayland and Xorg based sessions Patch60: VirtualBox-5.2.10-xclient.patch Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch # from OpenSuse @@ -601,6 +605,7 @@ desktop-file-validate \ install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_unitdir}/vboxservice.service install -p -m 0644 -D %{SOURCE8} %{buildroot}%{_presetdir}/96-vbox.preset install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules +install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_unitdir}/vboxclient.service %endif # Module Source Code @@ -719,6 +724,7 @@ getent passwd vboxadd >/dev/null || \ # Guest additions install %post guest-additions /sbin/ldconfig +%systemd_post vboxclient.service %systemd_post vboxservice.service #chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1 @@ -736,10 +742,12 @@ getent passwd vboxadd >/dev/null || \ #semanage fcontext -a -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1 %preun guest-additions +%systemd_preun vboxclient.service %systemd_preun vboxservice.service %postun guest-additions /sbin/ldconfig +%systemd_postun_with_restart vboxclient.service %systemd_postun_with_restart vboxservice.service %files server @@ -872,6 +880,7 @@ getent passwd vboxadd >/dev/null || \ %{_libdir}/VBoxGuestAdditions %{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh %{_sysconfdir}/xdg/autostart/vboxclient.desktop +%{_unitdir}/vboxclient.service %{_udevrulesdir}/60-vboxguest.rules %{_unitdir}/vboxservice.service %{_presetdir}/96-vbox.preset @@ -881,6 +890,17 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Sat Jun 13 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.10-3 +- Syncronize with virtualbox-guest-additions from Fedora +- Add a vboxclient.service which runs VBoxClient --vwsvga when using the + VMSVGA virtual GPU, this fixes resizing in wayland sessions (rhbz 1789545) +- Drop VBoxClient --vwsvga-x11 from VBoxClient-all, it is not necessary + now that we run VBoxClient --vwsvga as service and it was breaking resize + support with the VBoxSVGA virtual GPU (rhbz 1789545) +- Drop ExecStartPre modprove vboxvideo vboxsf from vboxservice.service, + this is not necessary, they will be loaded automatically + + * Mon Jun 08 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.10-2 - Install the new VBoxDRMClient binary for guest-additions - Drop wayland-crash patch and fix wrong path to modprobe diff --git a/update_vbox.sh b/update_vbox.sh index f9c160f..c92d9ad 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,7 +1,8 @@ VERSION=6.1.10 -REL=2 +REL=3 RAWHIDE=33 -REPOS="f32 f31 el7" +REPOS="f32 f31 el8 el7" +REPOS="el8 el7" if [ -z "$1" ] then stage=0 diff --git a/vboxclient.service b/vboxclient.service new file mode 100644 index 0000000..3fabb54 --- /dev/null +++ b/vboxclient.service @@ -0,0 +1,8 @@ +[Unit] +Description=VirtualBox guest VMSVGA resize client +ConditionVirtualization=|oracle + +[Service] +Type=simple +ExecStart=/usr/bin/VBoxDRMClient +Restart=on-failure