rpms/VirtualBox
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added patch to fix build of vbovideo with kernel 5.10 [release 6.1.18-2mamba;Thu Apr 15 2021]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 17:54:51 +01:00
parent 3340410bd8
commit 56140e1f2a
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
VirtualBox-6.1.18-kernel-5.10.patch Normal file
View File

@ -0,0 +1,13 @@
--- VirtualBox-6.1.18/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp.orig 2021-04-15 15:20:45.932726596 +0200
+++ VirtualBox-6.1.18/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp 2021-04-15 15:22:18.820418821 +0200
@@ -1479,6 +1479,10 @@
# if defined(RT_ARCH_AMD64)
__asm__(" \
movq g_pfnSupdrvProbeFireKernel(%rip), %rax \n\
+999:\n\
+ .pushsection .discard.retpoline_safe\n\
+ .quad 999b\n\
+ .popsection\n\
jmp *%rax \n\
");
# elif defined(RT_ARCH_X86)

17
VirtualBox.spec
View File

@ -18,7 +18,7 @@
Name: VirtualBox Name: VirtualBox
Version: 6.1.18 Version: 6.1.18
Release: 1mamba Release: 2mamba
Summary: A general-purpose full virtualizer for x86 hardware Summary: A general-purpose full virtualizer for x86 hardware
Group: Graphical Desktop/Applications/Utilities Group: Graphical Desktop/Applications/Utilities
Vendor: openmamba Vendor: openmamba
@ -48,6 +48,7 @@ Patch9: VirtualBox-5.2.2-no-vboxvideo.patch
Patch10: VirtualBox-5.2.30-x86-conflicting_type_ptrdiff_t.patch Patch10: VirtualBox-5.2.30-x86-conflicting_type_ptrdiff_t.patch
Patch11: VirtualBox-6.0.14-vbox-cpuhotplug-build.patch Patch11: VirtualBox-6.0.14-vbox-cpuhotplug-build.patch
Patch12: VirtualBox-6.1.10-vboxweb-gsoap.patch Patch12: VirtualBox-6.1.10-vboxweb-gsoap.patch
Patch13: VirtualBox-6.1.18-kernel-5.10.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -98,12 +99,12 @@ BuildRequires: java-openjdk8
#BuildRequires: java-jaxws #BuildRequires: java-jaxws
#BuildRequires: java-jws-api #BuildRequires: java-jws-api
Provides: kernelvboxdrv Provides: kernelvboxdrv
Obsoletes: kernelvboxdrv Obsoletes: kernelvboxdrv < 6.1.18
Requires(post):kernelheaders Requires(post):kernelheaders
Requires(post):dkms Requires(post):dkms
Requires(post):libelf-devel Requires(post):libelf-devel
Provides: virtualbox Provides: virtualbox
Obsoletes: virtualbox Obsoletes: virtualbox < 6.1.18
%description %description
VirtualBox is a general-purpose full virtualizer for x86 hardware. VirtualBox is a general-purpose full virtualizer for x86 hardware.
@ -136,7 +137,7 @@ VirtualBox Guest additions.
Summary: VirtualBox Guest additions ISO image Summary: VirtualBox Guest additions ISO image
Group: Applications/Emulators Group: Applications/Emulators
Provides: virtualbox-additions-VBoxGuest Provides: virtualbox-additions-VBoxGuest
Obsoletes: virtualbox-additions-VBoxGuest Obsoletes: virtualbox-additions-VBoxGuest < 6.1.18
%description additions-VBoxGuest %description additions-VBoxGuest
VirtualBox Guest additions ISO image. VirtualBox Guest additions ISO image.
@ -149,9 +150,9 @@ Provides: xorgdrvvideo
Requires: xorg-server >= %{xorg_ver} Requires: xorg-server >= %{xorg_ver}
Requires: xorg-server <= %{xorg_ver}.255 Requires: xorg-server <= %{xorg_ver}.255
Provides: VirtualBox-vboxguest Provides: VirtualBox-vboxguest
Obsoletes: VirtualBox-vboxguest Obsoletes: VirtualBox-vboxguest < 6.1.18
Provides: kernelvboxvideo Provides: kernelvboxvideo
Obsoletes: kernelvboxvideo Obsoletes: kernelvboxvideo < 6.1.18
%description -n xorg-drv-video-vboxvideo %description -n xorg-drv-video-vboxvideo
X.org video driver for VirtualBox guest machine- X.org video driver for VirtualBox guest machine-
@ -191,6 +192,7 @@ X.org mouse driver for VirtualBox guest machine.
%patch10 -p1 %patch10 -p1
%endif %endif
#%patch12 -p1 #%patch12 -p1
%patch13 -p1
%ifarch %{ix86} %ifarch %{ix86}
sed -i "s|VBOX_SUPPORTED_HOST_ARCHS := amd64|VBOX_SUPPORTED_HOST_ARCHS := x86|" Config.kmk sed -i "s|VBOX_SUPPORTED_HOST_ARCHS := amd64|VBOX_SUPPORTED_HOST_ARCHS := x86|" Config.kmk
@ -697,6 +699,9 @@ fi
#%{_prefix}/src/vboxvideo-%{version}/* #%{_prefix}/src/vboxvideo-%{version}/*
%changelog %changelog
* Thu Apr 15 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.18-2mamba
- added patch to fix build of vbovideo with kernel 5.10
* Sun Feb 28 2021 Automatic Build System <autodist@mambasoft.it> 6.1.18-1mamba * Sun Feb 28 2021 Automatic Build System <autodist@mambasoft.it> 6.1.18-1mamba
- automatic version update by autodist - automatic version update by autodist