forked from pool/virtualbox
Accepting request 1039144 from home:lwfinger:branches:Virtualization
Fixes boo#1205868 - VirtualBox 7.0.4 crashes when machine log is requested from GUI Deleted file "VBoxDDR0.r0" - no longer needed. Deleted file "Fix_for_server_1.19.patch" - no longer needed. Deleted file "fixes_for_Qt5.11.patch" - no longer needed. Deleted file "fix_lib_search.patch" - no longer needed. Deleted file "fixes_for_Leap42.3.patch" - target is obsolete. Deleted file "set_noexec_stack.patch" - not needed. Deleted file "fix_v7_build.patch" - not needed. Deleted file "fixes_for_gcc10.patch" - not needed. Deleted file "internal-headers.patch" - not needed. OBS-URL: https://build.opensuse.org/request/show/1039144 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=667
This commit is contained in:
Larry Finger
Git OBS Bridge
parent
636723de06
commit
f0db97f1a1
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -21,5 +21,3 @@
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
## Specific LFS patterns
|
||||
VBoxDDR0.r0 filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
||||
@@ -1236,7 +1236,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
|
||||
#endif
|
||||
|
||||
/* Register block and wake-up handlers for getting new screen size hints. */
|
||||
+#if XORG_VERSION_CURRENT >= 11900000
|
||||
+ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
|
||||
+#else
|
||||
RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
|
||||
+#endif
|
||||
|
||||
/* software cursor */
|
||||
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||
@@ -39,6 +39,10 @@
|
||||
#include "cursorstr.h"
|
||||
#include "servermd.h"
|
||||
|
||||
+#if XORG_VERSION_CURRENT >= 11900000
|
||||
+#include <bits/sigset.h>
|
||||
+typedef __sigset_t sigset_t;
|
||||
+#endif
|
||||
#include "vboxvideo.h"
|
||||
|
||||
#ifdef XORG_7X
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||
@@ -35,6 +35,10 @@
|
||||
* Michael Thayer <michael.thayer@oracle.com>
|
||||
*/
|
||||
|
||||
+#if XORG_VERSION_CURRENT >= 11900000
|
||||
+#include <bits/sigset.h>
|
||||
+typedef __sigset_t sigset_t;
|
||||
+#endif
|
||||
#include "misc.h"
|
||||
#include "xf86DDC.h"
|
||||
#include "xf86Crtc.h"
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4082b48497f26c10947649c937d1d02b46339a76df2f00c9b4f3a33be4dc8415
|
||||
size 306128
|
||||
@ -1,7 +1,7 @@
|
||||
Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
Index: VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
+++ VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
@@ -28,6 +28,7 @@
|
||||
/* Qt includes: */
|
||||
#include <QApplication>
|
||||
@ -10,10 +10,10 @@ Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
|
||||
#include <QPaintEvent>
|
||||
#include <QStyle>
|
||||
#include <QVBoxLayout>
|
||||
Index: VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
Index: VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
+++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
+++ VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
|
||||
@@ -47,7 +47,6 @@ class QIcon;
|
||||
class QLabel;
|
||||
class QMouseEvent;
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
Index: VirtualBox-7.0.4/configure
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/configure
|
||||
+++ VirtualBox-7.0.4/configure
|
||||
@@ -1630,14 +1630,14 @@ EOF
|
||||
INCQT5="$q/include $q/include/QtCore"
|
||||
FLGQT5="-DQT_SHARED -std=c++11"
|
||||
I_INCQT5=`prefix_I "$INCQT5"`
|
||||
- LIBQT5="-L$q/lib -lQt5CoreVBox -lQt5GuiVBox"
|
||||
+ LIBQT5="-L$q/lib -L$q/usr/lib64 -lQt5CoreVBox -lQt5GuiVBox"
|
||||
TOOLQT5="$q"
|
||||
if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
|
||||
test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
|
||||
foundqt5=2 # internal
|
||||
break;
|
||||
fi
|
||||
- LIBQT5="-L$q/lib -lQt5Core -lQt5Gui"
|
||||
+ LIBQT5="-L$q/lib -L$q/usr/lib64 -lQt5Core -lQt5Gui"
|
||||
if test_compile "$LIBQT5 $LIBPTHREAD $I_INCQT5 $FLGQT5" qt5 qt5 nofatal &&
|
||||
test_execute_path "`L_to_PATH "$LIBQT5"`" nofatal; then
|
||||
foundqt5=1 # no pkg-config, Qt directory
|
||||
@ -1,101 +0,0 @@
|
||||
Index: VirtualBox-7.0.4/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
|
||||
+++ VirtualBox-7.0.4/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm
|
||||
@@ -28,7 +28,7 @@ BEGINCODE
|
||||
extern NAME(dtrace_probe)
|
||||
|
||||
GLOBALNAME dtrace_probe6
|
||||
- jmp NAME(dtrace_probe)
|
||||
+ jmp [rel dtrace_probe wrt ..got]
|
||||
|
||||
%ifidn __OUTPUT_FORMAT__,elf
|
||||
section .note.GNU-stack noalloc noexec nowrite progbits
|
||||
Index: VirtualBox-7.0.4/src/VBox/VMM/Config.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/VMM/Config.kmk
|
||||
+++ VirtualBox-7.0.4/src/VBox/VMM/Config.kmk
|
||||
@@ -58,9 +58,7 @@ else
|
||||
VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
|
||||
endif
|
||||
endif
|
||||
-ifdef IEM_WITHOUT_ASSEMBLY
|
||||
VMM_COMMON_DEFS += IEM_WITHOUT_ASSEMBLY
|
||||
-endif
|
||||
# part of global DEFS
|
||||
ifdef VBOX_WITH_MULTI_CORE
|
||||
VMM_COMMON_DEFS += VBOX_WITH_MULTI_CORE
|
||||
Index: VirtualBox-7.0.4/src/VBox/VMM/testcase/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/VMM/testcase/Makefile.kmk
|
||||
+++ VirtualBox-7.0.4/src/VBox/VMM/testcase/Makefile.kmk
|
||||
@@ -358,7 +358,6 @@ tstIEMAImplAsm_ASFLAGS.x86 := -Werror
|
||||
tstIEMAImplAsm_INCS := ../include .
|
||||
tstIEMAImplAsm_SOURCES = \
|
||||
tstIEMAImpl.cpp \
|
||||
- ../VMMAll/IEMAllAImpl.asm \
|
||||
../VMMAll/IEMAllAImplC.cpp \
|
||||
$(tstIEMAImpl_CLEAN)
|
||||
tstIEMAImplAsm_SOURCES.x86 += tstIEMAImplDataSseBinary.asm
|
||||
Index: VirtualBox-7.0.4/src/VBox/VMM/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/VMM/Makefile.kmk
|
||||
+++ VirtualBox-7.0.4/src/VBox/VMM/Makefile.kmk
|
||||
@@ -226,7 +226,6 @@ VBoxVMM_SOURCES = \
|
||||
VMMAll/VMMAll.cpp
|
||||
VBoxVMM_SOURCES.amd64 += \
|
||||
VMMR3/PGMR3DbgA.asm \
|
||||
- $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
|
||||
VMMAll/VMMAllA.asm
|
||||
ifdef VBOX_WITH_VUSB
|
||||
VBoxVMM_SOURCES += VMMR3/PDMUsb.cpp
|
||||
@@ -545,7 +544,6 @@ if defined(VBOX_WITH_R0_MODULES) && !def
|
||||
VMMAll/HMVMXAll.cpp \
|
||||
VMMAll/IEMAll.cpp \
|
||||
VMMAll/IEMAllInstructionsInterpretOnly.cpp \
|
||||
- $(if-expr !defined(IEM_WITHOUT_ASSEMBLY),VMMAll/IEMAllAImpl.asm,) \
|
||||
VMMAll/IEMAllAImplC.cpp \
|
||||
VMMAll/IEMAllCImpl.cpp \
|
||||
VMMAll/IEMAllCImplSvmInstr.cpp \
|
||||
Index: VirtualBox-7.0.4/src/VBox/Devices/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Devices/Makefile.kmk
|
||||
+++ VirtualBox-7.0.4/src/VBox/Devices/Makefile.kmk
|
||||
@@ -1233,6 +1233,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
|
||||
else
|
||||
VBoxDDR0_TEMPLATE = VBoxR0
|
||||
endif
|
||||
+ VBoxDDR0_MEMSET = "y"
|
||||
VBoxDDR0_DEFS = \
|
||||
$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
|
||||
$(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
|
||||
Index: VirtualBox-7.0.4/src/VBox/Devices/Network/DevE1000.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Devices/Network/DevE1000.cpp
|
||||
+++ VirtualBox-7.0.4/src/VBox/Devices/Network/DevE1000.cpp
|
||||
@@ -44,7 +44,11 @@
|
||||
#include <iprt/ctype.h>
|
||||
#include <iprt/net.h>
|
||||
#include <iprt/semaphore.h>
|
||||
+#ifdef VBoxDDR0_MEMSET
|
||||
+#include <iprt/nocrt/string.h>
|
||||
+#else
|
||||
#include <iprt/string.h>
|
||||
+#endif
|
||||
#include <iprt/time.h>
|
||||
#include <iprt/uuid.h>
|
||||
#include <VBox/vmm/pdmdev.h>
|
||||
Index: VirtualBox-7.0.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
+++ VirtualBox-7.0.4/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c
|
||||
@@ -45,6 +45,9 @@
|
||||
#include "product-generated.h"
|
||||
#include "revision-generated.h"
|
||||
|
||||
+#if RTLNX_VER_MIN(6, 1, 0)
|
||||
+#include <linux/stdarg.h>
|
||||
+#endif
|
||||
#include <iprt/assert.h>
|
||||
#include <iprt/spinlock.h>
|
||||
#include <iprt/semaphore.h>
|
||||
@ -1,13 +0,0 @@
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/linux/sharedfolders/regops.c
|
||||
@@ -1451,7 +1451,7 @@ DECLINLINE(int) vbsf_lock_user_pages(uin
|
||||
# elif RTLNX_VER_MIN(4,6,0)
|
||||
ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
|
||||
# elif RTLNX_VER_RANGE(4,4,168, 4,5,0)
|
||||
- ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, papPages,
|
||||
+ ssize_t cPagesLocked = get_user_pages_unlocked(uPtrFrom, cPages, papPages,
|
||||
fWrite ? FOLL_WRITE | FOLL_FORCE : FOLL_FORCE);
|
||||
# elif RTLNX_VER_MIN(4,0,0)
|
||||
ssize_t cPagesLocked = get_user_pages_unlocked(current, current->mm, uPtrFrom, cPages, fWrite, 1 /*force*/, papPages);
|
||||
@ -1,24 +0,0 @@
|
||||
Index: VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
|
||||
+++ VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/precomp_vcc.h
|
||||
@@ -97,6 +97,7 @@
|
||||
#include <QtWidgets/qgraphicsitem.h>
|
||||
#include <QtWidgets/qgraphicslayoutitem.h>
|
||||
#include <QtWidgets/qgraphicswidget.h>
|
||||
+#include <QtWidgets/qbuttongroup.h>
|
||||
#include <QtCore/QMetaType>
|
||||
#include <QtGui/qevent.h>
|
||||
#include <QtGui/qtouchdevice.h>
|
||||
Index: VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
|
||||
+++ VirtualBox-7.0.4/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
/* Qt includes: */
|
||||
#include <QVBoxLayout>
|
||||
+#include <QButtonGroup>
|
||||
|
||||
/* GUI includes: */
|
||||
#include "UIGlobalSettingsProxy.h"
|
||||
@ -1,41 +0,0 @@
|
||||
Index: VirtualBox-7.0.4/Config.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.4/Config.kmk
|
||||
@@ -3102,15 +3102,17 @@ 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.2.1 for the moment
|
||||
+ VBOX_GCC_VERSION = 100201
|
||||
+ 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))|' )
|
||||
- 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' )
|
||||
endif
|
||||
endif
|
||||
-
|
||||
-# YASM macros
|
||||
ifndef DONT_USE_YASM
|
||||
include $(KBUILD_PATH)/tools/YASM.kmk
|
||||
if1of ($(KBUILD_HOST), win os2)
|
||||
Index: VirtualBox-7.0.4/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
+++ VirtualBox-7.0.4/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
@@ -478,7 +478,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";
|
||||
@ -1,59 +0,0 @@
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||
@@ -33,6 +33,9 @@ vboxvideo_70_DEFS := \
|
||||
ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
|
||||
vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
|
||||
endif
|
||||
+if1of ($(KBUILD_TARGET), linux)
|
||||
+ vboxvideo_70_DEFS += _POSIX_SOURCE ## X requires POSIX extensions
|
||||
+endif
|
||||
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
|
||||
vboxvideo_15_DEFS := \
|
||||
$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||
@@ -35,10 +35,6 @@
|
||||
* Michael Thayer <michael.thayer@oracle.com>
|
||||
*/
|
||||
|
||||
-#if XORG_VERSION_CURRENT >= 11900000
|
||||
-#include <bits/sigset.h>
|
||||
-typedef __sigset_t sigset_t;
|
||||
-#endif
|
||||
#include "misc.h"
|
||||
#include "xf86DDC.h"
|
||||
#include "xf86Crtc.h"
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||
@@ -39,10 +39,6 @@
|
||||
#include "cursorstr.h"
|
||||
#include "servermd.h"
|
||||
|
||||
-#if XORG_VERSION_CURRENT >= 11900000
|
||||
-#include <bits/sigset.h>
|
||||
-typedef __sigset_t sigset_t;
|
||||
-#endif
|
||||
#include "vboxvideo.h"
|
||||
|
||||
#ifdef XORG_7X
|
||||
Index: VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
||||
+++ VirtualBox-7.0.4/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
||||
@@ -42,8 +42,8 @@
|
||||
# pragma once
|
||||
#endif
|
||||
|
||||
-#include <VBoxVideoGuest.h>
|
||||
-#include <VBoxVideo.h>
|
||||
+#include <VBox/Graphics/VBoxVideoGuest.h>
|
||||
+#include <VBox/Graphics/VBoxVideo.h>
|
||||
#include "version-generated.h"
|
||||
|
||||
#define VBOX_VENDORID 0x80EE
|
||||
File diff suppressed because it is too large
Load Diff
@ -66,87 +66,17 @@ Index: VirtualBox-7.0.4/src/VBox/Installer/linux/vboxdrv.sh
|
||||
|
||||
# Secure boot on Ubuntu, Debian and Oracle Linux.
|
||||
if test -n "$HAVE_SEC_BOOT"; then
|
||||
Index: VirtualBox-7.0.4/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/Makefile.kmk
|
||||
+++ VirtualBox-7.0.4/Makefile.kmk
|
||||
@@ -69,8 +69,7 @@ OTHER_CLEAN += \
|
||||
$(VBOX_VERSION_STAMP) \
|
||||
$(wildcard $(PATH_OUT)/version-stamp-*.*.*) \
|
||||
$(VBOX_SVN_REV_KMK).ts \
|
||||
- $(VBOX_SVN_REV_KMK) \
|
||||
- $(PATH_OUT)/DynamicConfig.kmk
|
||||
+ $(VBOX_SVN_REV_KMK)
|
||||
|
||||
|
||||
if !defined(VBOX_ONLY_ADDITIONS) \
|
||||
Index: VirtualBox-7.0.4/Config.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-7.0.4.orig/Config.kmk
|
||||
+++ VirtualBox-7.0.4/Config.kmk
|
||||
@@ -3225,34 +3225,6 @@ $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/
|
||||
$(QUIET)$(APPEND) -tn "$@" "int foobar(void)" "{" " return 42;" "}" ""
|
||||
@@ -3111,6 +3111,9 @@ else
|
||||
$(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' )
|
||||
endif
|
||||
endif
|
||||
+ifndef VBOX_GCC_std
|
||||
+ VBOX_GCC_std := -std=c++17
|
||||
+endif
|
||||
|
||||
# No $(QUIET) here as it's interesting to see what goes into the file.
|
||||
-$(PATH_OUT)/DynamicConfig.kmk: \
|
||||
- $(PATH_ROOT)/Config.kmk \
|
||||
- $(LOCALCFG) \
|
||||
- $(AUTOCFG) \
|
||||
- $(VBOX_GCC_PATH_CC) \
|
||||
- $(VBOX_GCC_PATH_CXX) \
|
||||
- $(VBOX_GCC_LIBGCC) \
|
||||
- $(VBOX_GCC32_PATH_CC) \
|
||||
- $(VBOX_GCC32_PATH_CXX) \
|
||||
- $(VBOX_GCC32_LIBGCC) \
|
||||
- $(if-expr "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "solaris.amd64" && $(KBUILD_HOST_VERSION_MINOR) >= 11 \
|
||||
- , /platform/i86pc/kernel/$(KBUILD_HOST_ARCH)/unix,) \
|
||||
- | $(PATH_OUT)/DynamicConfig.c $(PATH_OUT)/DynamicConfig.cpp
|
||||
- $(call MSG_GENERATE,,$@,)
|
||||
- $(QUIET)$(RM) -f '$@'
|
||||
- $(QUIET)$(MKDIR) -p $(@D)
|
||||
- $(QUIET)$(APPEND) '$@' '# Host version: $(KBUILD_HOST_VERSION_MAJOR).$(KBUILD_HOST_VERSION_MINOR).$(KBUILD_HOST_VERSION_PATCH); full: $(KBUILD_HOST_VERSION)'
|
||||
-ifneq ($(KBUILD_TARGET),win)
|
||||
- $(QUIET)$(APPEND) '$@' '# $(KBUILD_HOST_UNAME_SYSNAME) - $(KBUILD_HOST_UNAME_RELEASE) - $(KBUILD_HOST_UNAME_VERSION)'
|
||||
-endif
|
||||
-ifeq ($(KBUILD_TARGET),darwin)
|
||||
- $(QUIET)$(APPEND) '$@' '# VBOX_XCODE_VERSION: $(VBOX_XCODE_VERSION)'
|
||||
- $(QUIET)$(APPEND) '$@' '# VBOX_PATH_MACOSX_TOOLCHAIN_ROOT: $(VBOX_PATH_MACOSX_TOOLCHAIN_ROOT)'
|
||||
- $(QUIET)$(APPEND) '$@' '# VBOX_PATH_MACOSX_SDK_ROOT: $(VBOX_PATH_MACOSX_SDK_ROOT)'
|
||||
- $(QUIET)$(APPEND) '$@' '# VBOX_PATH_MACOSX_DEVEL_ROOT: $(VBOX_PATH_MACOSX_DEVEL_ROOT)'
|
||||
- $(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CC ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
|
||||
- $(QUIET)$(APPEND) '$@' 'VBOX_CLANG_VERSION_CXX ?= $(call VBOX_CLANG_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
|
||||
-endif
|
||||
# HC compiler switch detection.
|
||||
$(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CC ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
|
||||
$(QUIET)$(APPEND) '$@' 'VBOX_GCC_VERSION_CXX ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
|
||||
@@ -3451,30 +3423,9 @@ endif
|
||||
$(QUIET)$(CAT) $@
|
||||
$(QUIET)$(ECHO) '=========== END OF $@ ========='
|
||||
|
||||
-include $(PATH_OUT)/DynamicConfig.kmk
|
||||
endif # !VBOX_NOINC_DYNAMIC_CONFIG_KMK
|
||||
|
||||
|
||||
-#
|
||||
-# C++ language level
|
||||
-# See https://en.cppreference.com/w/cpp/compiler_support and compiler docs.
|
||||
-#
|
||||
-## @todo consider maxing this out.
|
||||
-ifndef VBOX_GCC_std
|
||||
- if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64) # Go straight for c++17 here.
|
||||
-VBOX_GCC_std := -std=c++17
|
||||
-# else if "$(VBOX_CLANG_VERSION_CXX)" vge 60000 # Most language features complete by v6. Lib stuff was less complete in v6, but hopefully acceptable for out purposes.
|
||||
-#VBOX_GCC_std := -std=c++17
|
||||
- else if "$(VBOX_CLANG_VERSION_CXX)" vge 50000 # darwin Xcode 5 allegedly knows what C++11 is
|
||||
-VBOX_GCC_std := -std=c++11
|
||||
-# else if "$(VBOX_GCC_VERSION_CXX)" vge 70000 # Language feature P0512R0 was v8, rest v7 or earlier. Most lib stuff present in 7, complete in v12.
|
||||
-#VBOX_GCC_std := -std=gnu++17
|
||||
- else if "$(VBOX_GCC_VERSION_CXX)" vge 40800
|
||||
-VBOX_GCC_std := -std=c++11
|
||||
- else if "$(VBOX_GCC_VERSION_CXX)" vge 40600
|
||||
-VBOX_GCC_std := -std=c++0x
|
||||
- endif
|
||||
-endif
|
||||
ifndef VBOX_VCC_std
|
||||
if $(VBOX_VCC_TOOL_STEM) >= VCC141 # since 2017 15.3
|
||||
VBOX_VCC_std := -std:c++17 -Zc:__cplusplus
|
||||
# YASM macros
|
||||
ifndef DONT_USE_YASM
|
||||
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 29 15:54:36 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
Fixes boo#1205868 - VirtualBox 7.0.4 crashes when machine log is requested from GUI
|
||||
|
||||
Deleted file "VBoxDDR0.r0" - no longer needed.
|
||||
Deleted file "Fix_for_server_1.19.patch" - no longer needed.
|
||||
Deleted file "fixes_for_Qt5.11.patch" - no longer needed.
|
||||
Deleted file "fix_lib_search.patch" - no longer needed.
|
||||
Deleted file "fixes_for_Leap42.3.patch" - target is obsolete.
|
||||
Deleted file "set_noexec_stack.patch" - not needed.
|
||||
Deleted file "fix_v7_build.patch" - not needed.
|
||||
Deleted file "fixes_for_gcc10.patch" - not needed.
|
||||
Deleted file "internal-headers.patch" - not needed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 21 16:10:35 UTC 2022 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
|
||||
214
virtualbox.spec
214
virtualbox.spec
@ -88,7 +88,6 @@ Source22: vboxweb-service.sh
|
||||
Source23: vboxautostart-service.service
|
||||
Source24: vboxautostart-service.sh
|
||||
Source25: vboxclient.desktop
|
||||
Source26: VBoxDDR0.r0
|
||||
Source97: README.build
|
||||
Source98: virtualbox-rpmlintrc
|
||||
Source99: virtualbox-patch-source.sh
|
||||
@ -98,85 +97,70 @@ Patch2: vbox-vboxadd-init-script.diff
|
||||
#fix build : "Error 4001 - String must be entirely alphanumeric"
|
||||
#with renaming we probably break some macosx functionality however ths is just quick fix
|
||||
#see thread : http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html
|
||||
Patch6: vbox-smc-napa.diff
|
||||
Patch3: vbox-smc-napa.diff
|
||||
#deprecated old-style C++ service proxies and objects,we have to use soapcpp2 -z1 flag
|
||||
Patch9: vbox-deprec-gsoap-service-proxies.diff
|
||||
Patch4: vbox-deprec-gsoap-service-proxies.diff
|
||||
#fix failed linking process during build - this patch is just quick workaround
|
||||
Patch10: vbox-gsoapssl-deps.diff
|
||||
Patch5: vbox-gsoapssl-deps.diff
|
||||
#PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
|
||||
#try to start VirtualBox and is not member of vboxusers group
|
||||
Patch99: vbox-permissions_warning.diff
|
||||
Patch6: vbox-permissions_warning.diff
|
||||
#PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier
|
||||
Patch100: vbox-no-build-dates.diff
|
||||
Patch101: vbox-default-os-type.diff
|
||||
Patch7: vbox-no-build-dates.diff
|
||||
Patch8: vbox-default-os-type.diff
|
||||
# Disable the distributed versions of vboxdrv.sh and vboxadd.sh for security reasons.
|
||||
Patch102: security_fixes.patch
|
||||
Patch9: security_fixes.patch
|
||||
#disable update in vbox gui
|
||||
Patch103: vbox-disable-updates.diff
|
||||
Patch10: vbox-disable-updates.diff
|
||||
#use pie/fPIE for setuid binaries (bnc#743143)
|
||||
Patch104: vbox-fpie.diff
|
||||
Patch11: vbox-fpie.diff
|
||||
#smap issues on Haswell or Broadwell (boo#931461)
|
||||
Patch105: smap.diff
|
||||
Patch12: smap.diff
|
||||
# Patch to build with Factory gcc5
|
||||
Patch106: gcc5-real-support.patch
|
||||
Patch13: gcc5-real-support.patch
|
||||
# Patch to build with gnu sed correctly
|
||||
Patch107: virtualbox-sed-params.patch
|
||||
Patch14: virtualbox-sed-params.patch
|
||||
# Patch to use snprintf correcty and not overflow dst buffer
|
||||
Patch108: virtualbox-snpritnf-buffer-overflow.patch
|
||||
Patch15: virtualbox-snpritnf-buffer-overflow.patch
|
||||
# Patch to add code to explain USB Passthru
|
||||
Patch109: vbox-usb-warning.diff
|
||||
Patch16: vbox-usb-warning.diff
|
||||
# Patch to ensure that VirtualBoxVM is SUID
|
||||
Patch110: vbox-suid-warning.diff
|
||||
Patch17: vbox-suid-warning.diff
|
||||
# Fix symbol conflict between host and guest kmp
|
||||
Patch111: fix_conflict_between_host_and_guest.patch
|
||||
Patch18: fix_conflict_between_host_and_guest.patch
|
||||
# Fix change in kernel API for ttm_bo_move_memcpy()
|
||||
Patch112: modify_for_4_8_bo_move.patch
|
||||
Patch19: modify_for_4_8_bo_move.patch
|
||||
# Remove all mention of _smp_mflags
|
||||
Patch113: vbox_remove_smp_mflags.patch
|
||||
Patch20: vbox_remove_smp_mflags.patch
|
||||
# Disable experimental and incomplete CLOUD_NET
|
||||
Patch114: turn_off_cloud_net.patch
|
||||
# Fix for missing include needed for server 1.19
|
||||
Patch116: Fix_for_server_1.19.patch
|
||||
# Fix invalid use of internal headers
|
||||
Patch118: internal-headers.patch
|
||||
Patch21: turn_off_cloud_net.patch
|
||||
# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
|
||||
Patch120: fixes_for_python.patch
|
||||
# Fix build for Qt 5.11
|
||||
Patch122: fixes_for_Qt5.11.patch
|
||||
Patch22: fixes_for_python.patch
|
||||
# xpcom: Support up to python 3.10 -- https://www.virtualbox.org/changeset/90537/vbox + https://www.virtualbox.org/changeset/86623/vbox, thanks to Archlinux
|
||||
Patch123: vbox-python-py310.patch
|
||||
Patch23: vbox-python-py310.patch
|
||||
# fix build of Python and dev package on openSUSE 11.3 (was vbox-detection.diff)
|
||||
# use plain python3 interpreter of the distro (part of former switch_to_pyton3.4+.patch),
|
||||
Patch124: vbox-python-selection.patch
|
||||
Patch24: vbox-python-selection.patch
|
||||
# Use build parameters to control video driver problems
|
||||
Patch125: remove_vbox_video_build.patch
|
||||
# fix library search
|
||||
Patch128: fix_lib_search.patch
|
||||
Patch25: remove_vbox_video_build.patch
|
||||
# Fixes for modified kernel in Leap 42.3
|
||||
Patch129: VirtualBox-5.2.10-xclient.patch
|
||||
Patch130: fixes_for_Leap42.3.patch
|
||||
Patch26: VirtualBox-5.2.10-xclient.patch
|
||||
# Fixes for SLE12
|
||||
Patch131: fixes_for_sle12.patch
|
||||
Patch27: fixes_for_sle12.patch
|
||||
# Fixes for Qt5.13 on 32-bit systems
|
||||
Patch132: fixes_for_qt5.13.patch
|
||||
Patch28: fixes_for_qt5.13.patch
|
||||
# Fixes for openSUSE Leap 15.2
|
||||
Patch133: fixes_for_leap15.2.patch
|
||||
Patch29: fixes_for_leap15.2.patch
|
||||
# Fixes for kernel modules Makefile used at boot time
|
||||
Patch134: fixes_for_makefile.patch
|
||||
Patch30: fixes_for_makefile.patch
|
||||
# Fix build for Qt 5.15
|
||||
Patch135: fix-missing-includes-with-qt-5.15.patch
|
||||
# Fix builds with GCC10
|
||||
Patch136: fixes_for_gcc10.patch
|
||||
Patch31: fix-missing-includes-with-qt-5.15.patch
|
||||
# Fix for changes in GSOAP 2.8.103
|
||||
Patch137: handle_gsoap_208103.patch
|
||||
Patch32: handle_gsoap_208103.patch
|
||||
# Fix for struct file_operations backport in 15.3
|
||||
Patch142: fixes_for_leap15.3.patch
|
||||
Patch143: fix_kmp_build.patch
|
||||
#Fix for yasm defaulting to executable stack
|
||||
Patch144: set_noexec_stack.patch
|
||||
#Fix to make C++ generate PIC code, and fixes to make yasm have relocatable references to external globals
|
||||
Patch145: fix_v7_build.patch
|
||||
Patch999: virtualbox-fix-ui-background-color.patch
|
||||
Patch33: fixes_for_leap15.3.patch
|
||||
Patch34: fix_kmp_build.patch
|
||||
#Patch999: virtualbox-fix-ui-background-color.patch
|
||||
#
|
||||
# Common BuildRequires for both virtualbox and virtualbox-kmp
|
||||
BuildRequires: %{kernel_module_package_buildreqs}
|
||||
@ -316,13 +300,6 @@ hardware. VirtualBox is freely available as Open Source Software under
|
||||
the terms of the GNU Public License (GPL).
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
##########################################
|
||||
|
||||
%package qt
|
||||
@ -342,13 +319,6 @@ Obsoletes: %{name}-ose-qt < %{version}
|
||||
This package contains the code for the GUI used to control VMs.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#########################################
|
||||
|
||||
%package websrv
|
||||
@ -364,12 +334,6 @@ The VirtualBox web server is used to control headless VMs using a browser.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
%package guest-tools
|
||||
Summary: VirtualBox guest tools
|
||||
@ -392,13 +356,6 @@ Requires(pre): net-tools-deprecated
|
||||
VirtualBox guest addition tools.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
|
||||
%package -n python3-%{name}
|
||||
@ -419,13 +376,6 @@ Obsoletes: python3-%{name}-ose < %{version}
|
||||
Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
|
||||
%package devel
|
||||
@ -441,13 +391,6 @@ Obsoletes: %{name}-ose-devel < %{version}
|
||||
Development file for %{name}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
|
||||
%package host-source
|
||||
@ -480,13 +423,6 @@ These can be built for custom kernels using
|
||||
sudo %{_sbindir}/vboxguestconfig
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
|
||||
%package guest-desktop-icons
|
||||
@ -500,13 +436,6 @@ BuildArch: noarch
|
||||
This package contains icons for guest desktop files that were created on the desktop.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
###########################################
|
||||
|
||||
%package vnc
|
||||
@ -533,56 +462,45 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
|
||||
%setup -q -n VirtualBox-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch99 -p1
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
%patch104 -p1
|
||||
%patch105 -p1
|
||||
%patch106 -p1
|
||||
%patch107 -p1
|
||||
%patch108 -p1
|
||||
%patch109 -p1
|
||||
%patch110 -p1
|
||||
%patch111 -p1
|
||||
%patch112 -p1
|
||||
%patch113 -p1
|
||||
%patch114 -p1
|
||||
%patch116 -p1
|
||||
%patch118 -p1
|
||||
%patch120 -p1
|
||||
%patch122 -p1
|
||||
%patch123 -p1
|
||||
%patch124 -p1
|
||||
%patch125 -p1
|
||||
%patch128 -p1
|
||||
%patch129 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
%patch26 -p1
|
||||
# Adjustments that are version dependent
|
||||
%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
|
||||
# Patch for Leap 42.3
|
||||
%patch130 -p1
|
||||
%endif
|
||||
%patch131 -p1
|
||||
%patch27 -p1
|
||||
# Handle the 32-bit changes needed for Qt 5.13
|
||||
%ifarch %{ix86} && 0%{?qt5ver} >= 51300
|
||||
%patch132 -p1
|
||||
%patch28 -p1
|
||||
%endif
|
||||
%patch133 -p1
|
||||
%patch134 -p1
|
||||
%patch135 -p1
|
||||
%patch136 -p1
|
||||
%patch137 -p1
|
||||
%patch29 -p1
|
||||
%patch30 -p1
|
||||
%patch31 -p1
|
||||
%patch32 -p1
|
||||
%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
|
||||
# Patch for Leap 15.3
|
||||
%patch142 -p1
|
||||
%patch33 -p1
|
||||
%endif
|
||||
%patch143 -p1
|
||||
%patch144 -p1
|
||||
%patch145 -p1
|
||||
%patch34 -p1
|
||||
# make VB UI background colors look sane again
|
||||
##%patch999 -p1
|
||||
|
||||
@ -630,9 +548,8 @@ sed -i 's:include/drm:%{_prefix}/src/linux/include/drm:' src/VBox/Additions/linu
|
||||
rm -rf src/libs/{libpng-*,libxml2-*,libxslt-*,zlib-*,boost-*}
|
||||
|
||||
# --disable-kmods don't build Linux kernel modules - but use SUSE specific way see few lines under
|
||||
# NOT an autoconf configure macro
|
||||
# NOT an autoconf ceonfigure macro
|
||||
./configure \
|
||||
--ose \
|
||||
--enable-vnc \
|
||||
--enable-vde \
|
||||
--disable-kmods \
|
||||
@ -728,7 +645,6 @@ pushd out/linux.*/release/bin
|
||||
install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
|
||||
install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
|
||||
install -m 755 VBoxSDL %{buildroot}%{_vbox_instdir}
|
||||
#install -m 755 VBoxTunctl %{buildroot}%{_vbox_instdir}
|
||||
install -m 755 VBoxNetNAT %{buildroot}%{_vbox_instdir}
|
||||
install -m 755 VBoxAutostart %{buildroot}%{_vbox_instdir}
|
||||
install -m 755 VBoxVolInfo %{buildroot}%{_vbox_instdir}
|
||||
@ -745,7 +661,6 @@ install -m 755 vboximg-mount %{buildroot}%{_vbox_instdir}
|
||||
ln -s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
|
||||
ln -s %{_vbox_instdir}/VBoxHeadless %{buildroot}%{_bindir}/VBoxHeadless
|
||||
ln -s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
|
||||
#ln -s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
|
||||
ln -s %{_vbox_instdir}/vboximg-mount %{buildroot}%{_bindir}/vboximg-mount
|
||||
install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
|
||||
install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
|
||||
@ -764,7 +679,6 @@ install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
|
||||
install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
|
||||
install -m 644 *.so %{buildroot}%{_vbox_instdir}
|
||||
install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
|
||||
install -m 644 %{SOURCE26} %{buildroot}%{_vbox_instdir}
|
||||
install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/
|
||||
# install languages
|
||||
install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/
|
||||
@ -1022,7 +936,6 @@ export DISABLE_RESTART_ON_UPDATE=yes
|
||||
%{_bindir}/VBoxManage
|
||||
%{_bindir}/VBoxHeadless
|
||||
%{_bindir}/VBoxSDL
|
||||
#%{_bindir}/VBoxTunctl
|
||||
%{_bindir}/vboximg-mount
|
||||
%dir %{_vbox_instdir}
|
||||
%{_vbox_instdir}/VBoxAutostart
|
||||
@ -1050,7 +963,6 @@ export DISABLE_RESTART_ON_UPDATE=yes
|
||||
%{_vbox_instdir}/VBoxEFI*.fd
|
||||
%{_vbox_instdir}/VBoxManage
|
||||
%{_vbox_instdir}/VBoxSVC
|
||||
#%{_vbox_instdir}/VBoxTunctl
|
||||
%{_vbox_instdir}/VBoxXPCOMIPCD
|
||||
%{_vbox_instdir}/VBoxExtPackHelperApp
|
||||
%{_vbox_instdir}/vboximg-mount
|
||||
|
||||
Loading…
Reference in New Issue
Block a user