From 86ff591aaa031f3831b813a051447ab9f1072f455f4ac77fedfb01bced6c6df9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 2 Oct 2021 18:12:15 +0000 Subject: [PATCH] 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