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/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..f41817c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 + +- Remove vbox-fix-usb-rules.sh from qt package to avoid file conflict + +------------------------------------------------------------------- +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 + +- 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..cc16d62 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!! @@ -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/ # @@ -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 @@ -304,12 +302,6 @@ hardware. VirtualBox is freely available as Open Source Software under the terms of the GNU Public License (GPL). - - - - - - ########################################## %package qt @@ -320,7 +312,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} @@ -329,12 +321,6 @@ Obsoletes: %{name}-ose-qt < %{version} This package contains the code for the GUI used to control VMs. - - - - - - ######################################### %package websrv @@ -342,18 +328,12 @@ 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. - - - - - - ######################################### %package guest-x11 @@ -369,12 +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 @@ -395,12 +369,6 @@ Requires(pre): net-tools-deprecated VirtualBox guest addition tools. - - - - - - ########################################### %package -n python3-%{name} @@ -421,12 +389,6 @@ Obsoletes: python3-%{name}-ose < %{version} Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. - - - - - - ########################################### %package devel @@ -442,12 +404,6 @@ Obsoletes: %{name}-ose-devel < %{version} Development file for %{name} - - - - - - ########################################### %package host-source @@ -463,7 +419,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,12 +433,7 @@ 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 @@ -500,11 +451,6 @@ This package contains icons for guest desktop files that were created on the des - - - - - ########################################### %package vnc @@ -607,7 +553,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 @@ -1072,7 +1018,9 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_unitdir}/multi-user.target.wants/vboxautostart-service.service %{_sbindir}/rcvboxdrv %{_sbindir}/rcvboxautostart -/sbin/vboxconfig +/usr/sbin/vboxconfig +#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 @@ -1096,8 +1044,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 /sbin -%attr(0755,root,root) /sbin/vbox-fix-usb-rules.sh #ldd shows libQt* dependency %{_vbox_instdir}/VBoxTestOGL #qm's translations @@ -1126,8 +1072,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