forked from pool/virtualbox
245cab47c0
- Pseudo version bump to 6.1.13, which is NOT an Oracle release.
Update VB sources to run under kernel 5.8.0+ with no modifications to the
kernel. These sources are derived from r85883 of the Oracle svn repository.
For operations with USB{2,3}, the extension pack for revision 140056 must
be installed. Once Oracle releases 6.1.14, then the extension pack and
VB itself will have the same revision number.
File "fixes_for_5.8.patch" is removed as that part was fixed upstream.
Fixes boo#1175201.
OBS-URL: https://build.opensuse.org/request/show/830373
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=568
36 lines
2.0 KiB
Diff
36 lines
2.0 KiB
Diff
Index: VirtualBox-6.1.13/Config.kmk
|
|
===================================================================
|
|
--- VirtualBox-6.1.13.orig/Config.kmk
|
|
+++ VirtualBox-6.1.13/Config.kmk
|
|
@@ -2721,8 +2721,16 @@ else
|
|
# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
|
|
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
|
|
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
|
|
- VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
|
|
+ #
|
|
+ # Check to make sure that the compiler has either -dumpfullversion or -dumpversion. gcc-10 has neither
|
|
+ RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) ; echo $$?)
|
|
+ ifneq ($(RC),0)
|
|
+ # dump version commands not available - hardcode 10.0.1 for the moment
|
|
+ VBOX_GCC_VERSION = 100001
|
|
+ else
|
|
+ VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) | \
|
|
$(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|' )
|
|
+ endif
|
|
ifeq ($(KBUILD_TARGET), darwin)
|
|
VBOX_CLANG_VERSION = $(shell $(1) --version | \
|
|
$(SED_EXT) -n 's|.*version \([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(expr 10000 * \1 + 100 * $$(firstword \2 0) + $$(firstword \3 0))|p' )
|
|
Index: VirtualBox-6.1.13/src/VBox/Debugger/DBGCDumpImage.cpp
|
|
===================================================================
|
|
--- VirtualBox-6.1.13.orig/src/VBox/Debugger/DBGCDumpImage.cpp
|
|
+++ VirtualBox-6.1.13/src/VBox/Debugger/DBGCDumpImage.cpp
|
|
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
|
|
{
|
|
switch (iType)
|
|
{
|
|
- case CPU_TYPE_ANY: return "CPU_TYPE_ANY";
|
|
+ default: return "CPU_TYPE_ANY";
|
|
case CPU_TYPE_VAX: return "VAX";
|
|
case CPU_TYPE_MC680x0: return "MC680x0";
|
|
case CPU_TYPE_X86: return "X86";
|