diff --git a/vboxdrv.sh b/vboxdrv.sh index d8bf700..8745d48 100644 --- a/vboxdrv.sh +++ b/vboxdrv.sh @@ -27,10 +27,10 @@ # Description: VirtualBox Linux kernel module ### END INIT INFO -PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH +PATH=/usr/sbin:/usr/bin:$PATH DEVICE=/dev/vboxdrv LOG="/var/log/vbox-install.log" -MODPROBE=/sbin/modprobe +MODPROBE=/usr/sbin/modprobe SCRIPTNAME=vboxdrv.sh INSTALL_DIR=/usr/lib/virtualbox @@ -210,7 +210,7 @@ start_drv() failure "Cannot remove $DEVICE" fi if ! $MODPROBE vboxdrv > /dev/null 2>&1; then - /sbin/vboxconfig + /usr/sbin/vboxconfig if ! $MODPROBE vboxdrv > /dev/null 2>&1; then failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why" fi @@ -302,7 +302,7 @@ cleanup_vb() setup_vb() { # Try to build the host kernel modules in case prepackaging has failed - /sbin/vboxconfig + /usr/sbin/vboxconfig } dmnstatus() diff --git a/virtualbox.changes b/virtualbox.changes index 730e08f..2cad325 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 29 19:24:28 UTC 2021 - Larry Finger + +- Finish UsrMerge for VirtualBox components (boo#1191104). + ------------------------------------------------------------------- Wed Sep 8 04:54:25 UTC 2021 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 2b9646d..1c70b28 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -55,7 +55,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile # For 64-bit builds, no memory limit is reached when more jobs are run, but the builds crash with strange errors. # For the above reasons, limit the number of jobs to 2. %define _smp_mflags -j2 -%define _vbox_instdir %{_prefix}/lib/virtualbox +%define _vbox_instdir %{_prefix}/lib/virtualbox %define _udevrulesdir %{_prefix}/lib/udev/rules.d %endif # ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!! @@ -288,8 +288,6 @@ Requires(pre): net-tools-deprecated %if %{kmp_package} BuildRequires: libxml2-devel Requires: openSUSE-signkey-cert -Obsoletes: virtualbox-guest-kmp -Obsoletes: virtualbox-host-kmp %kernel_module_package -p %{SOURCE7} -n virtualbox -f %{SOURCE5} -x kdump um xen pae xenpae pv # end of kmp_package %endif @@ -310,6 +308,9 @@ the terms of the GNU Public License (GPL). + + + ########################################## %package qt @@ -320,7 +321,7 @@ Requires(pre): permissions Provides: %{name}-gui = %{version} #this is needed during update to trigger installing qt subpackage #http://en.opensuse.org/openSUSE:Upgrade_dependencies_explanation#Splitting_and_Merging -Provides: %{name}-ose:%{_prefix}/lib/virtualbox/VirtualBox.so +Provides: %{name}-ose:%{_vbox_instdir}/VirtualBox.so #rename from "ose" version: Provides: %{name}-ose-qt = %{version} Obsoletes: %{name}-ose-qt < %{version} @@ -335,6 +336,9 @@ This package contains the code for the GUI used to control VMs. + + + ######################################### %package websrv @@ -342,7 +346,7 @@ Summary: WebService GUI part for %{name} Group: System/Emulators/PC Requires: %{name} = %{version} Provides: %{name}-gui = %{version} -Obsoletes: %{name}-vboxwebsrv +Obsoletes: %{name}-vboxwebsrv < %{version} %description websrv The VirtualBox web server is used to control headless VMs using a browser. @@ -354,6 +358,9 @@ The VirtualBox web server is used to control headless VMs using a browser. + + + ######################################### %package guest-x11 @@ -375,6 +382,9 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers + + + ########################################### %package guest-tools @@ -401,6 +411,9 @@ VirtualBox guest addition tools. + + + ########################################### %package -n python3-%{name} @@ -427,6 +440,9 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. + + + ########################################### %package devel @@ -448,6 +464,9 @@ Development file for %{name} + + + ########################################### %package host-source @@ -463,7 +482,7 @@ BuildArch: noarch %description host-source Source files for %{name} host kernel modules These can be built for custom kernels using -sudo /sbin/vboxconfig +sudo /usr/sbin/vboxconfig %package guest-source Summary: Source files for %{name} guest kernel modules @@ -477,7 +496,10 @@ BuildArch: noarch %description guest-source Source files for %{name} guest kernel modules These can be built for custom kernels using -sudo /sbin/vboxguestconfig +sudo /usr/sbin/vboxguestconfig + + + @@ -505,6 +527,9 @@ This package contains icons for guest desktop files that were created on the des + + + ########################################### %package vnc @@ -607,7 +632,7 @@ cp %{SOURCE20} README.autostart #instead of kmk_sed use /usr/bin/sed because of bug http://svn.netlabs.org/kbuild/ticket/112, #but we have to create wrapper which will handle --append and --output options which are not provided by /usr/bin/sed cat >> kmk_sed < %{buildroot}%{_sysconfdir}/vbox/vbox.cfg # config file for vboxautostart cat > %{buildroot}%{_sysconfdir}/vbox/autostart.cfg << EOF @@ -910,7 +935,7 @@ getent group vboxvideo >/dev/null || groupadd -r vboxvideo ####################################################### %post -/sbin/ldconfig +/usr/sbin/ldconfig #setup our sysconfig file /etc/sysconfig/vbox %set_permissions %{_vbox_instdir}/VBoxNetNAT %set_permissions %{_vbox_instdir}/VBoxNetDHCP @@ -989,7 +1014,7 @@ exit 0 ####################################################### %postun -/sbin/ldconfig +/usr/sbin/ldconfig %restart_on_update vboxdrv %restart_on_update vboxautostart-service # immediately restarting virtualbox may not work. As such wait for the next reboot to restart @@ -1072,7 +1097,8 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_unitdir}/multi-user.target.wants/vboxautostart-service.service %{_sbindir}/rcvboxdrv %{_sbindir}/rcvboxautostart -/sbin/vboxconfig +/usr/sbin/vboxconfig +/usr/sbin/vbox-fix-usb-rules.sh %{_vbox_instdir}/VBoxCreateUSBNode.sh %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP @@ -1096,8 +1122,8 @@ export DISABLE_RESTART_ON_UPDATE=yes #wrapper script is in bindir %attr(0755,root,root) %{_bindir}/VirtualBox %attr(0755,root,root) %{_bindir}/update-extpack.sh -#rules fixing script is in /sbin -%attr(0755,root,root) /sbin/vbox-fix-usb-rules.sh +#rules fixing script is in /usr/sbin +%attr(0755,root,root) /usr/sbin/vbox-fix-usb-rules.sh #ldd shows libQt* dependency %{_vbox_instdir}/VBoxTestOGL #qm's translations @@ -1126,8 +1152,8 @@ export DISABLE_RESTART_ON_UPDATE=yes %files guest-tools %{_bindir}/VBoxControl %{_sbindir}/VBoxService -/sbin/vboxguestconfig -/sbin/mount.vboxsf +/usr/sbin/vboxguestconfig +/usr/sbin/mount.vboxsf %{_udevrulesdir}/60-vboxguest.rules %{_vbox_instdir}/vboxadd-service %{_unitdir}/vboxadd-service.service