Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at 2022-04-02 18:19:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Sat Apr 2 18:19:43 2022 rev:232 rq:965793 version:6.1.32
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2022-01-23
12:15:10.716672227 +0100
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.1900/virtualbox.changes
2022-04-02 18:19:45.622800549 +0200
@@ -1,0 +2,11 @@
+Tue Mar 29 19:01:11 UTC 2022 - Larry Finger <larry.fin...@gmail.com>
+
+- Add fixes for kernel 5.17 - file "fixes_for_kernel_5.17.patch" added
+ Add fixes for kernel 5.18 - file "fixes_for_kernel_5.18.patch" added
+
+-------------------------------------------------------------------
+Fri Mar 11 18:45:02 UTC 2022 - Larry Finger <larry.fin...@gmail.com>
+
+- Fix build error for guest modules in Leap 15.3
+
+-------------------------------------------------------------------
New:
----
fixes_for_kernel_5.17.patch
fixes_for_kernel_5.18.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.wV2si0/_old 2022-04-02 18:19:47.402780568 +0200
+++ /var/tmp/diff_new_pack.wV2si0/_new 2022-04-02 18:19:47.406780523 +0200
@@ -179,6 +179,8 @@
Patch142: fixes_for_leap15.3.patch
Patch143: vb-6.1.16-modal-dialog-parent.patch
Patch144: fixes_for_leap15.4.patch
+Patch145: fixes_for_kernel_5.17.patch
+Patch146: fixes_for_kernel_5.18.patch
Patch999: virtualbox-fix-ui-background-color.patch
#
# Common BuildRequires for both virtualbox and virtualbox-kmp
@@ -315,6 +317,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
##########################################
%package qt
Summary: Qt GUI part for %{name}
@@ -345,6 +359,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
#########################################
%package websrv
Summary: WebService GUI part for %{name}
@@ -369,6 +395,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
#########################################
%package guest-x11
Summary: VirtualBox X11 drivers for mouse and video
@@ -396,6 +434,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
###########################################
%package guest-tools
Summary: VirtualBox guest tools
@@ -427,6 +477,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
###########################################
%package -n python3-%{name}
Summary: Python bindings for %{name}
@@ -458,6 +520,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
###########################################
%package devel
Summary: Devel files for %{name}
@@ -484,6 +558,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
###########################################
%package host-source
Summary: Source files for %{name} host kernel modules
@@ -527,6 +613,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
###########################################
%package guest-desktop-icons
Summary: Icons for guest desktop files
@@ -551,6 +649,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
###########################################
%package vnc
Summary: VNC desktop sharing
@@ -627,6 +737,8 @@
%patch144 -p1
%endif
%patch143 -p1
+%patch145 -p1
+%patch146 -p1
# make VB UI background colors look sane again
%patch999 -p1
++++++ fixes_for_kernel_5.17.patch ++++++
Index: VirtualBox-6.1.32/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-6.1.32.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.32/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -50,6 +50,19 @@
#include "version-generated.h"
#include "revision-generated.h"
+/** Detect whether kernel mode setting is OFF. */
+#if defined(CONFIG_VGA_CONSOLE)
+# if RTLNX_VER_MIN(5,17,0)
+# define VBOX_VIDEO_NOMODESET() drm_firmware_drivers_only() && vbox_modeset
== -1
+# elif RTLNX_VER_MIN(4,7,0)
+# define VBOX_VIDEO_NOMODESET() vgacon_text_force() && vbox_modeset == -1
+# else /* < 4.7.0 */
+# define VBOX_VIDEO_NOMODESET() 0
+# endif /* < 4.7.0 */
+#else /* !CONFIG_VGA_CONSOLE */
+# define VBOX_VIDEO_NOMODESET() 0
+#endif /* !CONFIG_VGA_CONSOLE */
+
static int vbox_modeset = -1;
MODULE_PARM_DESC(modeset, "Disable/Enable modesetting");
@@ -401,15 +414,13 @@ static struct drm_driver driver = {
static int __init vbox_init(void)
{
printk("vboxvideo: loading version " VBOX_VERSION_STRING " r"
__stringify(VBOX_SVN_REV) "\n");
-#if defined(CONFIG_VGA_CONSOLE) || RTLNX_VER_MIN(4,7,0)
- if (vgacon_text_force() && vbox_modeset == -1)
+ if (VBOX_VIDEO_NOMODESET())
{
printk("vboxvideo: kernel is running with *nomodeset*
parameter,\n");
printk("vboxvideo: please consider either to remove it or load
driver\n");
printk("vboxvideo: with parameter modeset=1, unloading\n");
return -EINVAL;
}
-#endif
if (vbox_modeset == 0)
{
Index:
VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
===================================================================
---
VirtualBox-6.1.32.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
+++ VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c
@@ -66,6 +66,12 @@
#define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
+/** Set netdev MAC address. */
+#if RTLNX_VER_MIN(5,17,0)
+# define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len)
+#else /* < 5.17.0 */
+# define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len)
+#endif
/*********************************************************************************************************************************
* Internal Functions
*
@@ -303,7 +309,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
if (pNetDev->dev_addr)
{
- memcpy(pNetDev->dev_addr, pMACAddress, ETH_ALEN);
+ VBOX_DEV_ADDR_SET(pNetDev, pMACAddress, ETH_ALEN);
Log2(("vboxNetAdpOsCreate: pNetDev->dev_addr = %.6Rhxd\n",
pNetDev->dev_addr));
/*
++++++ fixes_for_kernel_5.18.patch ++++++
Index:
VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
---
VirtualBox-6.1.32.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.32/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -2314,8 +2314,13 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS
{
vboxNetFltDumpPacket(pSG, true, "host", (fDst &
INTNETTRUNKDIR_WIRE) ? 0 : 1);
Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n",
sizeof(pBuf->cb), pBuf->cb));
+# if RTLNX_VER_MAX(5, 18, 0)
Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf));
err = netif_rx_ni(pBuf);
+#else
+ Log6(("vboxNetFltPortOsXmit: netif_rx(%p)\n", pBuf));
+ err = netif_rx(pBuf);
+#endif
if (err)
rc = RTErrConvertFromErrno(err);
}
++++++ fixes_for_leap15.2.patch ++++++
--- /var/tmp/diff_new_pack.wV2si0/_old 2022-04-02 18:19:47.526779176 +0200
+++ /var/tmp/diff_new_pack.wV2si0/_new 2022-04-02 18:19:47.530779131 +0200
@@ -25,7 +25,7 @@
- .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
+#if RTLNX_VER_MAX(5,4,0)
+ .driver_features =
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
++#if defined(OPENSUSE_152)
+ DRIVER_PRIME |
+#endif
# if RTLNX_VER_MAX(5,1,0) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
