From cec0118629a6bb1f892135c6e4ab2001cb90f413a0a81ad65c67bc6a46d6cb9d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 1 Oct 2021 14:57:38 +0000 Subject: [PATCH 1/4] Accepting request 922582 from home:lwfinger:branches:Virtualization - Finish UsrMerge for VirtualBox components (boo#1191104). OBS-URL: https://build.opensuse.org/request/show/922582 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=616 --- vboxdrv.sh | 8 +++--- virtualbox.changes | 5 ++++ virtualbox.spec | 72 +++++++++++++++++++++++++++++++--------------- 3 files changed, 58 insertions(+), 27 deletions(-) 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 From 86ff591aaa031f3831b813a051447ab9f1072f455f4ac77fedfb01bced6c6df9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 2 Oct 2021 18:12:15 +0000 Subject: [PATCH 2/4] Accepting request 922810 from home:lwfinger:branches:Virtualization - Fix build failures in Leap 15.1 and Leap 15.2 due to kmk_sed issues. OBS-URL: https://build.opensuse.org/request/show/922810 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=617 --- fixes_for_leap15.2.patch | 161 +++++++++++++++++++++++++++++++++++---- virtualbox.changes | 5 ++ virtualbox.spec | 74 +++++++++++++++--- 3 files changed, 217 insertions(+), 23 deletions(-) diff --git a/fixes_for_leap15.2.patch b/fixes_for_leap15.2.patch index f452012..1916626 100644 --- a/fixes_for_leap15.2.patch +++ b/fixes_for_leap15.2.patch @@ -1,7 +1,7 @@ -Index: VirtualBox-6.1.24/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +Index: VirtualBox-6.1.26/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c =================================================================== ---- VirtualBox-6.1.24.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ VirtualBox-6.1.24/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +--- VirtualBox-6.1.26.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ VirtualBox-6.1.26/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -76,6 +76,10 @@ #define VBOXNETFLT_OS_SPECFIC 1 #include "../VBoxNetFltInternal.h" @@ -13,10 +13,10 @@ Index: VirtualBox-6.1.24/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux. typedef struct VBOXNETFLTNOTIFIER { struct notifier_block Notifier; PVBOXNETFLTINS pThis; -Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c +Index: VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_drv.c =================================================================== ---- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c +--- VirtualBox-6.1.26.orig/src/VBox/Additions/linux/drm/vbox_drv.c ++++ VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_drv.c @@ -310,12 +310,15 @@ static void vbox_master_drop(struct drm_ } @@ -36,11 +36,11 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_drv.c #else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, #endif /* < 5.4.0 */ -Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c +Index: VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_main.c =================================================================== ---- VirtualBox-6.1.24.orig/src/VBox/Additions/linux/drm/vbox_main.c -+++ VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c -@@ -640,8 +640,12 @@ static inline u64 vbox_bo_mmap_offset(st +--- VirtualBox-6.1.26.orig/src/VBox/Additions/linux/drm/vbox_main.c ++++ VirtualBox-6.1.26/src/VBox/Additions/linux/drm/vbox_main.c +@@ -638,8 +638,12 @@ static inline u64 vbox_bo_mmap_offset(st #elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0) return bo->bo.addr_space_offset; #else @@ -53,10 +53,10 @@ Index: VirtualBox-6.1.24/src/VBox/Additions/linux/drm/vbox_main.c } int -Index: VirtualBox-6.1.24/include/iprt/cdefs.h +Index: VirtualBox-6.1.26/include/iprt/cdefs.h =================================================================== ---- VirtualBox-6.1.24.orig/include/iprt/cdefs.h -+++ VirtualBox-6.1.24/include/iprt/cdefs.h +--- VirtualBox-6.1.26.orig/include/iprt/cdefs.h ++++ VirtualBox-6.1.26/include/iprt/cdefs.h @@ -1184,14 +1184,15 @@ * Tell the compiler that we're falling through to the next case in a switch. * @sa RT_FALL_THRU */ @@ -76,3 +76,138 @@ Index: VirtualBox-6.1.24/include/iprt/cdefs.h /** @def RT_IPRT_FORMAT_ATTR +Index: VirtualBox-6.1.26/kBuild/header.kmk +=================================================================== +--- VirtualBox-6.1.26.orig/kBuild/header.kmk ++++ VirtualBox-6.1.26/kBuild/header.kmk +@@ -754,7 +754,7 @@ RMDIR_EXT := $(KBUILD_BIN_PATH)/kmk_rm + RMDIR_INT := kmk_builtin_rmdir + RMDIR := $(RMDIR_INT) + +-SED_EXT := $(KBUILD_BIN_PATH)/kmk_sed$(HOSTSUFF_EXE) ++SED_EXT := /usr/bin/kmk_sed$(HOSTSUFF_EXE) + SED_INT := $(SED_EXT) + SED := $(SED_EXT) + +Index: VirtualBox-6.1.26/configure +=================================================================== +--- VirtualBox-6.1.26.orig/configure ++++ VirtualBox-6.1.26/configure +@@ -1881,7 +1881,7 @@ check_kbuild() + fi + echo "export PATH" >> $ENV + echo "unset path_kbuild_bin path_dev_bin" >> $ENV +- KBUILD_SED="$KBUILDDIR_BIN/kmk_sed" ++ KBUILD_SED="/usr/bin/kmk_sed" + elif [ "$OS.$BUILD_MACHINE" = "darwin.amd64" ]; then + # Currently there are no amd64 kBuild bins. So use the x86 variant in any case. + KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.x86" +@@ -1897,10 +1897,10 @@ check_kbuild() + echo "echo \"\$PATH\" | grep -q \"\$path_dev_bin\" || PATH=\"\$path_dev_bin:\$PATH\"" >> $ENV + echo "export PATH" >> $ENV + echo "unset path_kbuild_bin path_dev_bin" >> $ENV +- KBUILD_SED="$KBUILDDIR_BIN/kmk_sed" ++ KBUILD_SED="/usr/bin/kmk_sed" + elif check_avail "kmk" KBUILDDIR really; then + # check for installed kBuild +- KBUILD_SED="`which_wrapper kmk_sed`" ++ KBUILD_SED="/usr/bin/kmk_sed" + else + fail + fi +Index: VirtualBox-6.1.26/tools/bin/backport-commit.sh +=================================================================== +--- VirtualBox-6.1.26.orig/tools/bin/backport-commit.sh ++++ VirtualBox-6.1.26/tools/bin/backport-commit.sh +@@ -19,7 +19,7 @@ + # + # Determin script dir so we can source the common bits. + # +-MY_SED=kmk_sed ++MY_SED=/usr/bin/kmk_sed + MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. + if test "${MY_SCRIPT_DIR}" = "$0"; then + MY_SCRIPT_DIR=`pwd -L` +Index: VirtualBox-6.1.26/tools/bin/backport-common.sh +=================================================================== +--- VirtualBox-6.1.26.orig/tools/bin/backport-common.sh ++++ VirtualBox-6.1.26/tools/bin/backport-common.sh +@@ -1,4 +1,4 @@ +-# $Id: backport-common.sh $ ++ $Id: backport-common.sh $ + ## @file + # Common backport script bits. + # +@@ -23,7 +23,7 @@ + MY_PRINTF=kmk_printf + MY_RM=kmk_rm + MY_SVN=svn +- MY_SED=kmk_sed ++ MY_SED=/usr/bin/kmk_sed + + # + # Functions. +Index: VirtualBox-6.1.26/tools/bin/backport-merge-and-commit.sh +=================================================================== +--- VirtualBox-6.1.26.orig/tools/bin/backport-merge-and-commit.sh ++++ VirtualBox-6.1.26/tools/bin/backport-merge-and-commit.sh +@@ -19,7 +19,7 @@ + # + # Determin script dir so we can invoke the two worker scripts. + # +-MY_SED=kmk_sed ++MY_SED=/usr/bin/kmk_sed + MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. + if test "${MY_SCRIPT_DIR}" = "$0"; then + MY_SCRIPT_DIR=`pwd -L` +Index: VirtualBox-6.1.26/tools/bin/backport-merge.sh +=================================================================== +--- VirtualBox-6.1.26.orig/tools/bin/backport-merge.sh ++++ VirtualBox-6.1.26/tools/bin/backport-merge.sh +@@ -19,7 +19,7 @@ + # + # Determin script dir so we can source the common bits. + # +-MY_SED=kmk_sed ++MY_SED=/usr/bin/kmk_sed + MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows. + if test "${MY_SCRIPT_DIR}" = "$0"; then + MY_SCRIPT_DIR=`pwd -L` +Index: VirtualBox-6.1.26/tools/bin/gen-slickedit-workspace.sh +=================================================================== +--- VirtualBox-6.1.26.orig/tools/bin/gen-slickedit-workspace.sh ++++ VirtualBox-6.1.26/tools/bin/gen-slickedit-workspace.sh +@@ -23,7 +23,7 @@ MY_CAT="kmk_cat" + MY_CP="kmk_cp" + MY_MKDIR="kmk_mkdir" + MY_MV="kmk_mv" +-MY_SED="kmk_sed" ++MY_SED="/usr/bin/kmk_sed" + MY_RM="kmk_rm" + MY_SLEEP="kmk_sleep" + MY_EXPR="kmk_expr" +Index: VirtualBox-6.1.26/src/VBox/Main/Makefile.kmk +=================================================================== +--- VirtualBox-6.1.26.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-6.1.26/src/VBox/Main/Makefile.kmk +@@ -235,7 +235,7 @@ $(VBOX_XIDL_FILE).ts +| $(VBOX_XIDL_FILE + | $$(dir $$@) + $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) + $(QUIET)$(VBOX_XSLTPROC) -o $(VBOX_XIDL_FILE).ts-tmp $(VBOX_PATH_MAIN_SRC)/idl/docstrip.xsl $(VBOX_XIDL_FILE_SRC) +- $(QUIET)$(SED) -e 's/ *$(DOLLAR)//g' -e '/^$(DOLLAR)/d' --output $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE).ts-tmp ++ /usr/bin/kmk_sed -e 's/ *$(DOLLAR)//g' -e '/^$(DOLLAR)/d' --output $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE).ts-tmp + $(QUIET)$(RM) -- $(VBOX_XIDL_FILE).ts-tmp + $(QUIET)$(CP) --changed -fv -- $(VBOX_XIDL_FILE).ts $(VBOX_XIDL_FILE) + +Index: VirtualBox-6.1.26/src/VBox/Runtime/Makefile.kmk +=================================================================== +--- VirtualBox-6.1.26.orig/src/VBox/Runtime/Makefile.kmk ++++ VirtualBox-6.1.26/src/VBox/Runtime/Makefile.kmk +@@ -3662,6 +3662,7 @@ $(foreach lib,RuntimeR3 RuntimeBldProg V + # + # Generate the status code data. + # ++SED = "/usr/bin/kmk_sed" + $(IPRT_OUT_DIR)/errmsgdata.h: \ + $(VBOX_PATH_RUNTIME_SRC)/common/err/errmsg.sed \ + $(PATH_ROOT)/include/iprt/err.h \ diff --git a/virtualbox.changes b/virtualbox.changes index 2cad325..6b9e733 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 2 16:55:07 UTC 2021 - Larry Finger + +- Fix build failures in Leap 15.1 and Leap 15.2 due to kmk_sed issues. + ------------------------------------------------------------------- Wed Sep 29 19:24:28 UTC 2021 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 1c70b28..8f79025 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -63,8 +63,8 @@ Name: virtualbox%{?dash}%{?name_suffix} Version: 6.1.26 Release: 0 Summary: %{package_summary} -License: GPL-2.0-or-later # FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" +License: GPL-2.0-or-later Group: %{package_group} URL: https://www.virtualbox.org/ # @@ -311,8 +311,14 @@ the terms of the GNU Public License (GPL). -########################################## + + + + + + +########################################## %package qt Summary: Qt GUI part for %{name} Group: System/Emulators/PC @@ -339,8 +345,14 @@ This package contains the code for the GUI used to control VMs. -######################################### + + + + + + +######################################### %package websrv Summary: WebService GUI part for %{name} Group: System/Emulators/PC @@ -361,8 +373,14 @@ The VirtualBox web server is used to control headless VMs using a browser. -######################################### + + + + + + +######################################### %package guest-x11 Summary: VirtualBox X11 drivers for mouse and video Group: System/X11/Servers/XF86_4 @@ -385,8 +403,14 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers -########################################### + + + + + + +########################################### %package guest-tools Summary: VirtualBox guest tools Group: System/Emulators/PC @@ -414,8 +438,14 @@ VirtualBox guest addition tools. -########################################### + + + + + + +########################################### %package -n python3-%{name} Summary: Python bindings for %{name} Group: Development/Libraries/Python @@ -443,8 +473,14 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. -########################################### + + + + + + +########################################### %package devel Summary: Devel files for %{name} Group: Development/Libraries/Other @@ -467,8 +503,14 @@ Development file for %{name} -########################################### + + + + + + +########################################### %package host-source Summary: Source files for %{name} host kernel modules Group: Development/Sources @@ -508,8 +550,14 @@ sudo /usr/sbin/vboxguestconfig -########################################### + + + + + + +########################################### %package guest-desktop-icons Summary: Icons for guest desktop files Group: System/Emulators/PC @@ -530,8 +578,14 @@ This package contains icons for guest desktop files that were created on the des -########################################### + + + + + + +########################################### %package vnc Summary: VNC desktop sharing Group: System/Emulators/PC From 822fcfac17f709982b25463f83d9e9fbdfd281c92e22855e96de523f02dd0595 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 3 Oct 2021 15:43:40 +0000 Subject: [PATCH 3/4] Accepting request 922840 from home:frispete:kernel Larry, no idea, what these white space changes are about, but found them in your spec as well, so I guess, some run-away spec-cleaner is in effect.. :-( This is the correct fix now, and the reason for not detecting it befor is burried in the Virtualization project config: %if "%_repository" == "openSUSE_Factory" # rpmlint results (in the rare case they have any meaning) are only relevant for Factory %else Substitute: clamav bash Substitute: clamav-database bash Substitute: post-build-checks bash Substitute: post-build-checks-malwarescan bash Substitute: rpmlint-Factory bash Substitute: rpmlint-Factory-strict bash Substitute: rpmlint-backports bash Substitute: rpmlint-backports-data bash Substitute: rpmlint-mini bash %endif Of course, there's no openSUSE_Factory target! Best, Pete - Remove vbox-fix-usb-rules.sh from qt package to avoid file conflict OBS-URL: https://build.opensuse.org/request/show/922840 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=618 --- virtualbox.changes | 5 +++++ virtualbox.spec | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index 6b9e733..1348067 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 2 22:59:48 UTC 2021 - Hans-Peter Jansen + +- Remove vbox-fix-usb-rules.sh from qt package to avoid file conflict + ------------------------------------------------------------------- Sat Oct 2 16:55:07 UTC 2021 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 8f79025..9b71dc6 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -318,7 +318,9 @@ the terms of the GNU Public License (GPL). + ########################################## + %package qt Summary: Qt GUI part for %{name} Group: System/Emulators/PC @@ -352,7 +354,9 @@ This package contains the code for the GUI used to control VMs. + ######################################### + %package websrv Summary: WebService GUI part for %{name} Group: System/Emulators/PC @@ -380,7 +384,9 @@ The VirtualBox web server is used to control headless VMs using a browser. + ######################################### + %package guest-x11 Summary: VirtualBox X11 drivers for mouse and video Group: System/X11/Servers/XF86_4 @@ -410,7 +416,9 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers + ########################################### + %package guest-tools Summary: VirtualBox guest tools Group: System/Emulators/PC @@ -445,7 +453,9 @@ VirtualBox guest addition tools. + ########################################### + %package -n python3-%{name} Summary: Python bindings for %{name} Group: Development/Libraries/Python @@ -480,7 +490,9 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. + ########################################### + %package devel Summary: Devel files for %{name} Group: Development/Libraries/Other @@ -510,7 +522,9 @@ Development file for %{name} + ########################################### + %package host-source Summary: Source files for %{name} host kernel modules Group: Development/Sources @@ -557,7 +571,9 @@ sudo /usr/sbin/vboxguestconfig + ########################################### + %package guest-desktop-icons Summary: Icons for guest desktop files Group: System/Emulators/PC @@ -585,7 +601,9 @@ This package contains icons for guest desktop files that were created on the des + ########################################### + %package vnc Summary: VNC desktop sharing Group: System/Emulators/PC @@ -1152,7 +1170,8 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_sbindir}/rcvboxdrv %{_sbindir}/rcvboxautostart /usr/sbin/vboxconfig -/usr/sbin/vbox-fix-usb-rules.sh +#rules fixing script is in /usr/sbin +%attr(0755,root,root) /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 @@ -1176,8 +1195,6 @@ 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 /usr/sbin -%attr(0755,root,root) /usr/sbin/vbox-fix-usb-rules.sh #ldd shows libQt* dependency %{_vbox_instdir}/VBoxTestOGL #qm's translations From c935c452ca7e719fa809f353b57c33ed312a4674042f3fc741ea75c78206ed4d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 5 Oct 2021 16:20:22 +0000 Subject: [PATCH 4/4] Accepting request 923305 from home:frispete:kernel Sure, here we go. - Fix ldconfig invocation in scriptlets OBS-URL: https://build.opensuse.org/request/show/923305 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=619 --- virtualbox.changes | 5 ++ virtualbox.spec | 155 +-------------------------------------------- 2 files changed, 7 insertions(+), 153 deletions(-) diff --git a/virtualbox.changes b/virtualbox.changes index 1348067..f41817c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 5 15:46:41 UTC 2021 - Hans-Peter Jansen + +- Fix ldconfig invocation in scriptlets + ------------------------------------------------------------------- Sat Oct 2 22:59:48 UTC 2021 - Hans-Peter Jansen diff --git a/virtualbox.spec b/virtualbox.spec index 9b71dc6..cc16d62 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -302,23 +302,6 @@ hardware. VirtualBox is freely available as Open Source Software under the terms of the GNU Public License (GPL). - - - - - - - - - - - - - - - - - ########################################## %package qt @@ -338,23 +321,6 @@ Obsoletes: %{name}-ose-qt < %{version} This package contains the code for the GUI used to control VMs. - - - - - - - - - - - - - - - - - ######################################### %package websrv @@ -368,23 +334,6 @@ Obsoletes: %{name}-vboxwebsrv < %{version} The VirtualBox web server is used to control headless VMs using a browser. - - - - - - - - - - - - - - - - - ######################################### %package guest-x11 @@ -400,23 +349,6 @@ Obsoletes: xorg-x11-driver-virtualbox-ose < %{version} This package contains X11 guest utilities and X11 guest mouse and video drivers - - - - - - - - - - - - - - - - - ########################################### %package guest-tools @@ -437,23 +369,6 @@ Requires(pre): net-tools-deprecated VirtualBox guest addition tools. - - - - - - - - - - - - - - - - - ########################################### %package -n python3-%{name} @@ -474,23 +389,6 @@ Obsoletes: python3-%{name}-ose < %{version} Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. - - - - - - - - - - - - - - - - - ########################################### %package devel @@ -506,23 +404,6 @@ Obsoletes: %{name}-ose-devel < %{version} Development file for %{name} - - - - - - - - - - - - - - - - - ########################################### %package host-source @@ -556,22 +437,6 @@ sudo /usr/sbin/vboxguestconfig - - - - - - - - - - - - - - - - ########################################### %package guest-desktop-icons @@ -586,22 +451,6 @@ This package contains icons for guest desktop files that were created on the des - - - - - - - - - - - - - - - - ########################################### %package vnc @@ -1007,7 +856,7 @@ getent group vboxvideo >/dev/null || groupadd -r vboxvideo ####################################################### %post -/usr/sbin/ldconfig +/sbin/ldconfig #setup our sysconfig file /etc/sysconfig/vbox %set_permissions %{_vbox_instdir}/VBoxNetNAT %set_permissions %{_vbox_instdir}/VBoxNetDHCP @@ -1086,7 +935,7 @@ exit 0 ####################################################### %postun -/usr/sbin/ldconfig +/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