forked from pool/virtualbox
Accepting request 136607 from home:seife:branches:Virtualization
- update to 4.2.0 - rebase patches - remove kernel-3.6 patch, no longer needed OBS-URL: https://build.opensuse.org/request/show/136607 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=102
This commit is contained in:
parent
9099a819e0
commit
60e90398d1
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:65fa3472cd21dd5fcbf766f3eb7fcf2f77aaafd6a4e768df749270d3b6af4d0c
|
||||
size 46432363
|
3
VirtualBox-4.2.0-patched.tar.bz2
Normal file
3
VirtualBox-4.2.0-patched.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c63ff90c5c41d76d2fbe8f6b0483646f4fac0b027e9c0ce2277003329006043
|
||||
size 48282705
|
@ -1,15 +1,21 @@
|
||||
--- src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp.orig 2010-11-10 21:27:23.000000000 +0100
|
||||
+++ src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2010-11-10 21:27:53.000000000 +0100
|
||||
@@ -199,10 +199,10 @@
|
||||
if (xpIndex != -1)
|
||||
mCbType->setCurrentIndex (xpIndex);
|
||||
}
|
||||
- /* Or select Ubuntu item for Linux family as default */
|
||||
+ /* Or select openSUSE item for Linux family as default */
|
||||
else if (familyId == "Linux")
|
||||
Index: src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
|
||||
@@ -198,14 +198,14 @@ void UINameAndSystemEditor::sltFamilyCha
|
||||
{
|
||||
- int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID);
|
||||
+ int ubIndex = mCbType->findData ("OpenSUSE", RoleTypeID);
|
||||
if (ubIndex != -1)
|
||||
mCbType->setCurrentIndex (ubIndex);
|
||||
int iIndexWinXP = m_pTypeCombo->findData("WindowsXP", TypeID);
|
||||
if (iIndexWinXP != -1)
|
||||
m_pTypeCombo->setCurrentIndex(iIndexWinXP);
|
||||
}
|
||||
- /* Or select Ubuntu item for Linux family as default: */
|
||||
+ /* Or select OpenSUSE item for Linux family as default: */
|
||||
else if (strFamilyId == "Linux")
|
||||
{
|
||||
- int iIndexUbuntu = m_pTypeCombo->findData("Ubuntu", TypeID);
|
||||
+ int iIndexUbuntu = m_pTypeCombo->findData("OpenSUSE", TypeID);
|
||||
if (iIndexUbuntu != -1)
|
||||
m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
|
||||
}
|
||||
/* Else simply select the first one present: */
|
||||
else m_pTypeCombo->setCurrentIndex(0);
|
||||
|
@ -1,6 +1,10 @@
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
Index: src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||
@@ -63,7 +63,7 @@ void UIGlobalSettingsUpdate::loadToCache
|
||||
@@ -61,11 +61,11 @@ void UIGlobalSettingsUpdate::loadToCache
|
||||
/* Load data to corresponding widgets from cache,
|
||||
* this task SHOULD be performed in GUI thread only: */
|
||||
void UIGlobalSettingsUpdate::getFromCache()
|
||||
{
|
||||
/* Apply internal variables data to QWidget(s): */
|
||||
@ -9,19 +13,31 @@
|
||||
if (m_pEnableUpdateCheckbox->isChecked())
|
||||
{
|
||||
m_pUpdatePeriodCombo->setCurrentIndex(m_cache.m_periodIndex);
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
||||
if (m_cache.m_branchIndex == VBoxUpdateData::BranchWithBetas)
|
||||
m_pUpdateFilterBetasRadio->setChecked(true);
|
||||
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h
|
||||
@@ -34,7 +34,6 @@ public:
|
||||
@@ -37,11 +37,10 @@ public:
|
||||
|
||||
enum GLSettingsPage
|
||||
{
|
||||
GLSettingsPage_General = 0,
|
||||
GLSettingsPage_Input,
|
||||
- GLSettingsPage_Update,
|
||||
GLSettingsPage_Language,
|
||||
GLSettingsPage_Display,
|
||||
GLSettingsPage_USB,
|
||||
GLSettingsPage_Network,
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
GLSettingsPage_Extension,
|
||||
Index: src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig
|
||||
+++ src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||
@@ -340,15 +340,6 @@ UISettingsDialogGlobal::UISettingsDialog
|
||||
@@ -327,19 +327,10 @@ UISettingsDialogGlobal::UISettingsDialog
|
||||
addItem(":/hostkey_32px.png", ":/hostkey_disabled_32px.png",
|
||||
":/hostkey_16px.png", ":/hostkey_disabled_16px.png",
|
||||
iPageIndex, "#input", pSettingsPage);
|
||||
break;
|
||||
}
|
||||
@ -37,7 +53,11 @@
|
||||
/* Language page: */
|
||||
case GLSettingsPage_Language:
|
||||
{
|
||||
@@ -481,9 +472,6 @@ void UISettingsDialogGlobal::retranslate
|
||||
pSettingsPage = new UIGlobalSettingsLanguage;
|
||||
addItem(":/site_32px.png", ":/site_disabled_32px.png",
|
||||
@@ -474,13 +465,10 @@ void UISettingsDialogGlobal::retranslate
|
||||
m_pSelector->setItemText(GLSettingsPage_General, tr("General"));
|
||||
|
||||
/* Input page: */
|
||||
m_pSelector->setItemText(GLSettingsPage_Input, tr("Input"));
|
||||
|
||||
@ -47,3 +67,5 @@
|
||||
/* Language page: */
|
||||
m_pSelector->setItemText(GLSettingsPage_Language, tr("Language"));
|
||||
|
||||
/* Display page: */
|
||||
m_pSelector->setItemText(GLSettingsPage_Display, tr("Display"));
|
||||
|
@ -2,7 +2,9 @@ Index: src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp.orig
|
||||
+++ src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
|
||||
@@ -388,7 +388,7 @@ extern "C" DECLEXPORT(int) TrustedMain (
|
||||
@@ -386,11 +386,11 @@ extern "C" DECLEXPORT(int) TrustedMain (
|
||||
uint32_t secureLabelPointSize = 12;
|
||||
char *secureLabelFontFile = NULL;
|
||||
#endif
|
||||
int rc = VINF_SUCCESS;
|
||||
|
||||
@ -11,7 +13,11 @@ Index: src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
|
||||
|
||||
// less than one parameter is not possible
|
||||
if (argc < 2)
|
||||
@@ -1051,10 +1051,9 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE
|
||||
{
|
||||
show_usage();
|
||||
@@ -1049,14 +1049,13 @@ DECLCALLBACK(int) VMPowerUpThread(RTTHRE
|
||||
/* some introductory information */
|
||||
RTTIMESPEC TimeSpec;
|
||||
char szNowUct[64];
|
||||
RTTimeSpecToString(RTTimeNow(&TimeSpec), szNowUct, sizeof(szNowUct));
|
||||
RTLogRelLogger(pLogger, 0, ~0U,
|
||||
@ -24,31 +30,15 @@ Index: src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
|
||||
|
||||
/* register this logger as the release logger */
|
||||
RTLogRelSetDefaultInstance(pLogger);
|
||||
Index: src/VBox/Main/src-client/ConsoleImpl.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Main/src-client/ConsoleImpl.cpp.orig
|
||||
+++ src/VBox/Main/src-client/ConsoleImpl.cpp
|
||||
@@ -6146,13 +6146,13 @@ HRESULT Console::consoleInitReleaseLog(c
|
||||
char szTmp[256];
|
||||
RTTimeSpecToString(RTTimeNow(&timeSpec), szTmp, sizeof(szTmp));
|
||||
RTLogRelLogger(pReleaseLogger, 0, ~0U,
|
||||
- "VirtualBox %s r%u %s (%s %s) release log\n"
|
||||
+ "VirtualBox %s r%u %s release log\n"
|
||||
#ifdef VBOX_BLEEDING_EDGE
|
||||
"EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
|
||||
- __DATE__, __TIME__, szTmp);
|
||||
+ szTmp);
|
||||
|
||||
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
}
|
||||
else
|
||||
Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VBoxFB/VBoxFB.cpp.orig
|
||||
+++ src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
|
||||
@@ -60,11 +60,11 @@ int main(int argc, char *argv[])
|
||||
{ "scale", no_argument, NULL, 'c' }
|
||||
};
|
||||
|
||||
printf("VirtualBox DirectFB GUI built %s %s\n"
|
||||
"(C) 2004-" VBOX_C_YEAR " " VBOX_VENDOR "\n"
|
||||
@ -57,11 +47,15 @@ Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||
|
||||
for (;;)
|
||||
{
|
||||
c = getopt_long(argc, argv, "s:", options, NULL);
|
||||
if (c == -1)
|
||||
Index: src/VBox/Runtime/common/string/uniread.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Runtime/common/string/uniread.cpp.orig
|
||||
+++ src/VBox/Runtime/common/string/uniread.cpp
|
||||
@@ -979,7 +979,7 @@ int PrintHeader(const char *argv0)
|
||||
@@ -977,11 +977,11 @@ int PrintHeader(const char *argv0)
|
||||
{
|
||||
Stream1Printf("/** @file\n"
|
||||
" *\n"
|
||||
" * IPRT - Unicode Tables.\n"
|
||||
" *\n"
|
||||
@ -70,11 +64,15 @@ Index: src/VBox/Runtime/common/string/uniread.cpp
|
||||
" */\n"
|
||||
"\n"
|
||||
"/*\n"
|
||||
" * Copyright (C) 2006-2010 Oracle Corporation\n"
|
||||
" *\n"
|
||||
Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
===================================================================
|
||||
--- src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c.orig
|
||||
+++ src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
@@ -42,16 +42,13 @@
|
||||
@@ -40,20 +40,17 @@
|
||||
|
||||
/************************************************************************/
|
||||
/**************************IDENTITY AND VERSIONING***********************/
|
||||
/************************************************************************/
|
||||
#include "_pl_bld.h"
|
||||
@ -96,11 +94,15 @@ Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
#if defined(DEBUG)
|
||||
#define _DEBUG_STRING " (debug)"
|
||||
Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
===================================================================
|
||||
--- src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c.orig
|
||||
+++ src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
@@ -44,16 +44,10 @@
|
||||
@@ -42,20 +42,14 @@
|
||||
/**************************IDENTITY AND VERSIONING***********************/
|
||||
/************************************************************************/
|
||||
#ifndef XP_MAC
|
||||
#include "_pr_bld.h"
|
||||
#endif
|
||||
@ -119,11 +121,15 @@ Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
#if defined(DEBUG)
|
||||
#define _DEBUG_STRING " (debug)"
|
||||
Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
===================================================================
|
||||
--- src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c.orig
|
||||
+++ src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
@@ -42,16 +42,13 @@
|
||||
@@ -40,20 +40,17 @@
|
||||
|
||||
/************************************************************************/
|
||||
/**************************IDENTITY AND VERSIONING***********************/
|
||||
/************************************************************************/
|
||||
#include "_pl_bld.h"
|
||||
@ -145,11 +151,15 @@ Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
#if defined(DEBUG)
|
||||
#define _DEBUG_STRING " (debug)"
|
||||
Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
===================================================================
|
||||
--- src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c.orig
|
||||
+++ src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
@@ -42,16 +42,13 @@
|
||||
@@ -40,20 +40,17 @@
|
||||
|
||||
/************************************************************************/
|
||||
/**************************IDENTITY AND VERSIONING***********************/
|
||||
/************************************************************************/
|
||||
#include "_pl_bld.h"
|
||||
@ -171,50 +181,15 @@ Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||
#if !defined(_PRODUCTION)
|
||||
#define _PRODUCTION ""
|
||||
#endif
|
||||
Index: src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp.orig
|
||||
+++ src/VBox/Frontends/VBoxBalloonCtrl/VBoxBalloonCtrl.cpp
|
||||
@@ -1110,7 +1110,7 @@ static void logHeaderFooter(PRTLOGGER pL
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
|
||||
- __DATE__, __TIME__, szTmp);
|
||||
+ "openSUSE", "Buildservice", szTmp);
|
||||
|
||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
Index: src/VBox/Main/src-server/Logging.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Main/src-server/Logging.cpp.orig
|
||||
+++ src/VBox/Main/src-server/Logging.cpp
|
||||
@@ -51,7 +51,7 @@ static void vboxsvcHeaderFooter(PRTLOGGE
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
|
||||
- __DATE__, __TIME__, szTmp);
|
||||
+ "openSUSE", "Buildservice", szTmp);
|
||||
|
||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
Index: src/VBox/Main/webservice/vboxweb.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Main/webservice/vboxweb.cpp.orig
|
||||
+++ src/VBox/Main/webservice/vboxweb.cpp
|
||||
@@ -739,7 +739,7 @@ static void WebLogHeaderFooter(PRTLOGGER
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
|
||||
- __DATE__, __TIME__, szTmp);
|
||||
+ "openSUSE", "Buildservice", szTmp);
|
||||
|
||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
#if defined(DEBUG)
|
||||
#define _DEBUG_STRING " (debug)"
|
||||
Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig
|
||||
+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
@@ -157,10 +157,10 @@ static void VBoxServiceLogHeaderFooter(P
|
||||
@@ -155,14 +155,14 @@ static void VBoxServiceLogHeaderFooter(P
|
||||
switch (enmPhase)
|
||||
{
|
||||
case RTLOGPHASE_BEGIN:
|
||||
{
|
||||
pfnLog(pLoggerRelease,
|
||||
@ -227,11 +202,15 @@ Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||
|
||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
pfnLog(pLoggerRelease, "OS Product: %s\n", szTmp);
|
||||
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
|
||||
Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
||||
===================================================================
|
||||
--- src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp.orig
|
||||
+++ src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
||||
@@ -148,7 +148,7 @@ static int vboxInitLogging(const char *p
|
||||
@@ -146,11 +146,11 @@ static int vboxInitLogging(const char *p
|
||||
#ifdef VBOX_BLEEDING_EDGE
|
||||
"EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
VBOX_VERSION_STRING, RTBldCfgRevision(), VBOX_BUILD_TARGET,
|
||||
@ -240,3 +219,39 @@ Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
||||
|
||||
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
RTLogRelLogger(loggerRelease, 0, ~0U, "OS Product: %s\n", szTmp);
|
||||
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
|
||||
Index: src/VBox/Devices/PC/BIOS/bios.c
|
||||
===================================================================
|
||||
--- src/VBox/Devices/PC/BIOS/bios.c.orig
|
||||
+++ src/VBox/Devices/PC/BIOS/bios.c
|
||||
@@ -149,11 +149,11 @@ void set_mode(uint8_t mode);
|
||||
//@todo: restore
|
||||
//#undef VBOX
|
||||
|
||||
#define BX_PCIBIOS 1
|
||||
#define BX_APPNAME "VirtualBox"
|
||||
-#define BIOS_BUILD_DATE __DATE__
|
||||
+#define BIOS_BUILD_DATE "openSUSE Buildservice"
|
||||
//--------------------------------------------------------------------------
|
||||
// print_bios_banner
|
||||
// displays a the bios version
|
||||
//--------------------------------------------------------------------------
|
||||
void BIOSCALL print_bios_banner(void)
|
||||
Index: src/VBox/Main/glue/com.cpp
|
||||
===================================================================
|
||||
--- src/VBox/Main/glue/com.cpp.orig
|
||||
+++ src/VBox/Main/glue/com.cpp
|
||||
@@ -238,11 +238,11 @@ static void vboxHeaderFooter(PRTLOGGER p
|
||||
#ifdef VBOX_BLEEDING_EDGE
|
||||
"EXPERIMENTAL build " VBOX_BLEEDING_EDGE "\n"
|
||||
#endif
|
||||
"Log opened %s\n",
|
||||
g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(),
|
||||
- RTBldCfgTargetDotArch(), __DATE__, __TIME__, szTmp);
|
||||
+ RTBldCfgTargetDotArch(), "openSUSE", "Buildservice", szTmp);
|
||||
|
||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||
pfnLog(pReleaseLogger, "OS Product: %s\n", szTmp);
|
||||
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szTmp, sizeof(szTmp));
|
||||
|
@ -1,19 +1,21 @@
|
||||
Index: VirtualBox-4.1.2_OSE/src/apps/Makefile.kmk
|
||||
Index: VirtualBox-4.2.0/src/apps/Makefile.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-4.1.2_OSE.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-4.1.2_OSE/src/apps/Makefile.kmk
|
||||
@@ -34,5 +34,7 @@ if1of ($(KBUILD_TARGET),darwin solaris l
|
||||
--- VirtualBox-4.2.0.orig/src/apps/Makefile.kmk
|
||||
+++ VirtualBox-4.2.0/src/apps/Makefile.kmk
|
||||
@@ -32,7 +32,9 @@ if1of ($(KBUILD_TARGET),darwin solaris l
|
||||
ifneq ($(wildcard $(PATH_SUB_CURRENT)/adpctl),)
|
||||
include $(PATH_SUB_CURRENT)/adpctl/Makefile.kmk
|
||||
endif
|
||||
endif
|
||||
|
||||
+include $(PATH_SUB_CURRENT)/VBoxPermissionMessage/Makefile.kmk
|
||||
+
|
||||
include $(KBUILD_PATH)/subfooter.kmk
|
||||
include $(FILE_KBUILD_SUB_FOOTER)
|
||||
|
||||
Index: VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
Index: VirtualBox-4.2.0/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
+++ VirtualBox-4.2.0/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
@@ -0,0 +1,31 @@
|
||||
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
||||
+## @file
|
||||
@ -46,10 +48,10 @@ Index: VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||
+
|
||||
+include $(KBUILD_PATH)/subfooter.kmk
|
||||
+
|
||||
Index: VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
Index: VirtualBox-4.2.0/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ VirtualBox-4.1.2_OSE/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
+++ VirtualBox-4.2.0/src/apps/VBoxPermissionMessage/VBoxPermissionMessage.cpp
|
||||
@@ -0,0 +1,12 @@
|
||||
+#include <QtGui/QApplication>
|
||||
+#include <QtGui/QMessageBox>
|
||||
|
@ -2,7 +2,9 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
===================================================================
|
||||
--- src/VBox/Additions/linux/installer/vboxadd.sh.orig
|
||||
+++ src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
@@ -21,14 +21,18 @@
|
||||
@@ -19,15 +19,16 @@
|
||||
# chkconfig: 357 30 70
|
||||
# description: VirtualBox Linux Additions kernel modules
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: vboxadd
|
||||
@ -17,24 +19,12 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
+# Short-Description: VirtualBox Linux Additions kernel modules
|
||||
### END INIT INFO
|
||||
|
||||
-. /var/lib/VBoxGuestAdditions/config
|
||||
+if [ -f /var/lib/VBoxGuestAdditions/config ]; then
|
||||
+ . /var/lib/VBoxGuestAdditions/config
|
||||
+fi
|
||||
+
|
||||
export BUILD_TYPE
|
||||
export USERNAME
|
||||
|
||||
@@ -169,8 +173,6 @@ fi
|
||||
|
||||
dev=/dev/vboxguest
|
||||
userdev=/dev/vboxuser
|
||||
-owner=vboxadd
|
||||
-group=1
|
||||
|
||||
test_for_gcc_and_make()
|
||||
{
|
||||
@@ -256,12 +258,6 @@ do_vboxguest_non_udev()
|
||||
PATH=$PATH:/bin:/sbin:/usr/sbin
|
||||
PACKAGE=VBoxGuestAdditions
|
||||
LOG="/var/log/vboxadd-install.log"
|
||||
@@ -248,32 +249,20 @@ do_vboxguest_non_udev()
|
||||
mknod -m 0664 $dev c $maj $min || {
|
||||
rmmod vboxguest 2>/dev/null
|
||||
fail "Cannot create device $dev with major $maj and minor $min"
|
||||
}
|
||||
fi
|
||||
@ -47,7 +37,10 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
|
||||
if [ ! -c $userdev ]; then
|
||||
maj=10
|
||||
@@ -272,12 +268,6 @@ do_vboxguest_non_udev()
|
||||
min=`sed -n 's;\([0-9]\+\) vboxuser;\1;p' /proc/misc`
|
||||
if [ ! -z "$min" ]; then
|
||||
mknod -m 0666 $userdev c $maj $min || {
|
||||
rm -f $dev 2>/dev/null
|
||||
rmmod vboxguest 2>/dev/null
|
||||
fail "Cannot create device $userdev with major $maj and minor $min"
|
||||
}
|
||||
@ -60,43 +53,30 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -308,8 +298,7 @@ start()
|
||||
do_vboxguest_non_udev;;
|
||||
esac
|
||||
|
||||
- if [ -n "$BUILDVBOXSF" ]; then
|
||||
- running_vboxsf || {
|
||||
+ running_vboxsf || {
|
||||
$MODPROBE vboxsf > /dev/null 2>&1 || {
|
||||
if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
|
||||
fail_msg
|
||||
@@ -319,8 +308,7 @@ start()
|
||||
fi
|
||||
fail "modprobe vboxsf failed"
|
||||
start()
|
||||
@@ -478,36 +467,12 @@ extra_setup()
|
||||
}
|
||||
- }
|
||||
- fi
|
||||
+ }
|
||||
|
||||
# Mount all shared folders from /etc/fstab. Normally this is done by some
|
||||
# other startup script but this requires the vboxdrv kernel module loaded.
|
||||
@@ -337,10 +325,8 @@ stop()
|
||||
if ! umount -a -t vboxsf 2>/dev/null; then
|
||||
fail "Cannot unmount vboxsf folders"
|
||||
fi
|
||||
- if [ -n "$BUILDVBOXSF" ]; then
|
||||
- if running_vboxsf; then
|
||||
- rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf"
|
||||
- fi
|
||||
+ if running_vboxsf; then
|
||||
+ rmmod vboxsf 2>/dev/null || fail "Cannot unload module vboxsf"
|
||||
fi
|
||||
if running_vboxguest; then
|
||||
rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
|
||||
@@ -500,16 +486,8 @@ extra_setup()
|
||||
# setup_script
|
||||
setup()
|
||||
{
|
||||
- if test -r $config; then
|
||||
- . $config
|
||||
- else
|
||||
- fail "Configuration file $config not found"
|
||||
- fi
|
||||
- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
|
||||
- fail "Configuration file $config not complete"
|
||||
- export BUILD_TYPE
|
||||
- export USERNAME
|
||||
-
|
||||
- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
|
||||
- BUILDINTMP="$MODULE_SRC/build_in_tmp"
|
||||
- DODKMS="$MODULE_SRC/do_dkms"
|
||||
- chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
|
||||
- chcon -t bin_t "$DODKMS" > /dev/null 2>&1
|
||||
-
|
||||
- setup_modules
|
||||
- mod_succ="$?"
|
||||
- extra_setup
|
||||
@ -112,3 +92,5 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
|
||||
}
|
||||
|
||||
# cleanup_script
|
||||
cleanup()
|
||||
{
|
||||
|
@ -2,7 +2,9 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
===================================================================
|
||||
--- src/VBox/Installer/linux/vboxdrv.sh.in.orig
|
||||
+++ src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
@@ -19,11 +19,12 @@
|
||||
@@ -17,15 +17,16 @@
|
||||
# chkconfig: 35 20 80
|
||||
# description: VirtualBox Linux kernel module
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: vboxdrv
|
||||
@ -18,7 +20,11 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
### END INIT INFO
|
||||
|
||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
|
||||
@@ -195,13 +196,6 @@ start()
|
||||
DEVICE=/dev/vboxdrv
|
||||
LOG="/var/log/vbox-install.log"
|
||||
@@ -191,17 +192,10 @@ start()
|
||||
rmmod vboxdrv 2>/dev/null
|
||||
failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR"
|
||||
fi
|
||||
fi
|
||||
# ensure permissions
|
||||
@ -32,13 +38,17 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
|
||||
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
|
||||
fi
|
||||
@@ -299,58 +293,8 @@ stop_vms()
|
||||
if ! $MODPROBE vboxnetadp > /dev/null 2>&1; then
|
||||
failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why"
|
||||
@@ -295,66 +289,12 @@ stop_vms()
|
||||
}
|
||||
|
||||
# setup_script
|
||||
setup()
|
||||
{
|
||||
- stop
|
||||
- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
|
||||
- $DODKMS uninstall > $LOG
|
||||
- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
|
||||
- succ_msg
|
||||
- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
|
||||
- begin_msg "Removing old VirtualBox pci kernel module"
|
||||
@ -61,26 +71,30 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
- succ_msg
|
||||
- fi
|
||||
- begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
|
||||
- if ! $DODKMS install >> $LOG; then
|
||||
- if ! $DODKMS install vboxhost $VERSION >> $LOG; then
|
||||
- fail_msg "Failed, trying without DKMS"
|
||||
- begin_msg "Recompiling VirtualBox kernel modules"
|
||||
- if ! $BUILDVBOXDRV \
|
||||
- if ! $BUILDINTMP \
|
||||
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
|
||||
- --module-source "$MODULE_SRC/vboxdrv" \
|
||||
- --no-print-directory install >> $LOG 2>&1; then
|
||||
- failure "Look at $LOG to find out what went wrong"
|
||||
- fi
|
||||
- if ! $BUILDVBOXNETFLT \
|
||||
- if ! $BUILDINTMP \
|
||||
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
|
||||
- --module-source "$MODULE_SRC/vboxnetflt" \
|
||||
- --no-print-directory install >> $LOG 2>&1; then
|
||||
- failure "Look at $LOG to find out what went wrong"
|
||||
- fi
|
||||
- if ! $BUILDVBOXNETADP \
|
||||
- if ! $BUILDINTMP \
|
||||
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
|
||||
- --module-source "$MODULE_SRC/vboxnetadp" \
|
||||
- --no-print-directory install >> $LOG 2>&1; then
|
||||
- failure "Look at $LOG to find out what went wrong"
|
||||
- fi
|
||||
- if ! $BUILDVBOXPCI \
|
||||
- if ! $BUILDINTMP \
|
||||
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
|
||||
- --module-source "$MODULE_SRC/vboxpci" \
|
||||
- --no-print-directory install >> $LOG 2>&1; then
|
||||
- failure "Look at $LOG to find out what went wrong"
|
||||
- fi
|
||||
@ -92,3 +106,5 @@ Index: src/VBox/Installer/linux/vboxdrv.sh.in
|
||||
}
|
||||
|
||||
dmnstatus()
|
||||
{
|
||||
if running vboxdrv; then
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1ec156c9e8773e581ecfa5161c8351c1e11adefe0c10d7df4a5e39e43d8cbbef
|
||||
size 5082221
|
3
virtualbox-4.2.0-UserManual.pdf
Normal file
3
virtualbox-4.2.0-UserManual.pdf
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:867962290f7f8738d623624b1901493f40abf1c60ffd9efcc4323a4669b437d8
|
||||
size 5604205
|
@ -1,14 +0,0 @@
|
||||
--- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 42783)
|
||||
+++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 42784)
|
||||
@@ -106,7 +106,9 @@
|
||||
{
|
||||
/* .driver_features = DRIVER_USE_MTRR, */
|
||||
.load = vboxvideo_driver_load,
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
|
||||
.reclaim_buffers = drm_core_reclaim_buffers,
|
||||
+#endif
|
||||
/* As of Linux 2.6.37, always the internal functions are used. */
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37) && !defined(DRM_RHEL61)
|
||||
.get_map_ofs = drm_core_get_map_ofs,
|
||||
Index: vboxvideo_dac.c
|
||||
===================================================================
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 28 11:43:59 UTC 2012 - seife+obs@b1-systems.com
|
||||
|
||||
- update to 4.2.0
|
||||
- rebase patches
|
||||
- remove kernel-3.6 patch, no longer needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 27 07:47:14 UTC 2012 - idonmez@suse.com
|
||||
|
||||
|
@ -46,7 +46,9 @@ BuildRequires: dev86
|
||||
BuildRequires: e2fsprogs-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: kbuild
|
||||
##### virtualbox 4.2.0 does not work with older versions (check in makefile),
|
||||
##### and fails with newer versions (tested with rev2662)
|
||||
BuildRequires: kbuild = 0.1.9998svn2577
|
||||
BuildRequires: kernel-syms
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libcurl-devel
|
||||
@ -80,7 +82,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit
|
||||
%endif
|
||||
#
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
Version: 4.1.18
|
||||
Version: 4.2.0
|
||||
Release: 0
|
||||
Summary: VirtualBox is an Emulator
|
||||
License: GPL-2.0+
|
||||
@ -105,7 +107,7 @@ Source10: %{name}-LocalConfig.kmk
|
||||
# init script to start virtual boxes during boot, to be configured via /etc/sysconfig/vbox bnc#582398
|
||||
Source12: %{name}-vboxes
|
||||
Source13: %{name}-sysconfig.vbox
|
||||
Source98: %{name}-%{version}-rpmlintrc
|
||||
Source98: %{name}-rpmlintrc
|
||||
Source99: %{name}-patch-source.sh
|
||||
#rework init scripts to fit suse needs
|
||||
Patch1: vbox-vboxdrv-init-script.diff
|
||||
@ -130,8 +132,6 @@ Patch101: vbox-default-os-type.diff
|
||||
Patch103: vbox-disable-updates.diff
|
||||
#use pie/fPIE for setuid binaries (bnc#743143)
|
||||
Patch104: vbox-fpie.diff
|
||||
# Fix compilation with kernel 3.6, upstream r42784
|
||||
Patch105: virtualbox-kernel-3.6.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
PreReq: pwdutils permissions
|
||||
Requires: %{name}-host-kmp = %version
|
||||
@ -254,7 +254,6 @@ Development file for %{name}
|
||||
%patch101
|
||||
%patch103
|
||||
%patch104 -p1
|
||||
%patch105 -p1
|
||||
#copy user manual
|
||||
%__cp %{S:1} UserManual.pdf
|
||||
#copy kbuild config
|
||||
@ -712,6 +711,8 @@ exit 0
|
||||
%{_vbox_instdir}/VBoxAuth.so
|
||||
%{_vbox_instdir}/VBoxAuthSimple.so
|
||||
%{_vbox_instdir}/VBoxDbg.so
|
||||
%{_vbox_instdir}/VBoxDragAndDropSvc.so
|
||||
%{_vbox_instdir}/VBoxVMMPreload.so
|
||||
#
|
||||
%dir %{_vbox_instdir}/components
|
||||
%{_vbox_instdir}/components/*.so
|
||||
|
Loading…
Reference in New Issue
Block a user