rpms/VirtualBox-OSE/F-13 VirtualBox-OSE-00-vboxvideo.conf, NONE,
1.1 VirtualBox-OSE-3.2.0-32bit.patch, NONE,
1.1 VirtualBox-OSE-3.2.0-cpuid.patch, NONE,
1.1 VirtualBox-OSE-3.2.0-noansi.patch, NONE,
1.1 VirtualBox-OSE-3.2.0-noupdate.patch, NONE,
1.1 VirtualBox-OSE-3.2.0-strings.patch, NONE,
1.1 VirtualBox-OSE-3.2.0-visibility.patch, NONE,
1.1 VirtualBox-OSE-3.2.0-xorg17.patch, NONE,
1.1 VirtualBox-OSE-3.2.4-libcxx.patch, NONE,
1.1 VirtualBox-OSE-3.2.4-optflags.patch, NONE,
1.1 VirtualBox-OSE-3.2.6-acpi.patch, NONE,
1.1 VirtualBox-OSE-3.2.6-gcc45.patch, NONE,
1.1 VirtualBox-OSE-3.2.6-vboxkeyboard.patch, NONE,
1.1 .cvsignore, 1.16, 1.17 VirtualBox-OSE-guest.modules, 1.5,
1.6 VirtualBox-OSE.modules, 1.5, 1.6 VirtualBox-OSE.spec, 1.49,
1.50 sources, 1.17, 1.18 VirtualBox-OSE-3.0.4-noansi.patch, 1.1,
NONE VirtualBox-OSE-3.0.4-optflags.patch, 1.1,
NONE VirtualBox-OSE-3.1.0-libcxx.patch, 1.1,
NONE VirtualBox-OSE-3.1.0-noupdate.patch, 1.1,
NONE VirtualBox-OSE-3.1.0-strings.patch, 1.2,
NONE VirtualBox-OSE-3.1.0-visibility.patch, 1.1,
NONE VirtualBox-OSE-3.1.6-32bit.patch, 1.1,
NONE VirtualBox-OSE-3.1.8-xorg17.patch, 1.1,
NONE VirtualBox-OSE-90-vboxdrv.rules.hardening, 1.2,
NONE VirtualBox-OSE.blacklist-kvm, 1.1, NONE
Lubomir Rintel
lkundrak at rpmfusion.org
Tue Jul 13 09:23:17 CEST 2010
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21154/F-13
Modified Files:
.cvsignore VirtualBox-OSE-guest.modules VirtualBox-OSE.modules
VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-00-vboxvideo.conf
VirtualBox-OSE-3.2.0-32bit.patch
VirtualBox-OSE-3.2.0-cpuid.patch
VirtualBox-OSE-3.2.0-noansi.patch
VirtualBox-OSE-3.2.0-noupdate.patch
VirtualBox-OSE-3.2.0-strings.patch
VirtualBox-OSE-3.2.0-visibility.patch
VirtualBox-OSE-3.2.0-xorg17.patch
VirtualBox-OSE-3.2.4-libcxx.patch
VirtualBox-OSE-3.2.4-optflags.patch
VirtualBox-OSE-3.2.6-acpi.patch
VirtualBox-OSE-3.2.6-gcc45.patch
VirtualBox-OSE-3.2.6-vboxkeyboard.patch
Removed Files:
VirtualBox-OSE-3.0.4-noansi.patch
VirtualBox-OSE-3.0.4-optflags.patch
VirtualBox-OSE-3.1.0-libcxx.patch
VirtualBox-OSE-3.1.0-noupdate.patch
VirtualBox-OSE-3.1.0-strings.patch
VirtualBox-OSE-3.1.0-visibility.patch
VirtualBox-OSE-3.1.6-32bit.patch
VirtualBox-OSE-3.1.8-xorg17.patch
VirtualBox-OSE-90-vboxdrv.rules.hardening
VirtualBox-OSE.blacklist-kvm
Log Message:
Merge from devel
--- NEW FILE VirtualBox-OSE-00-vboxvideo.conf ---
Section "Device"
Identifier "Videocard666"
Driver "vboxvideo"
EndSection
VirtualBox-OSE-3.2.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 18 ++++++++++++++----
3 files changed, 23 insertions(+), 5 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-32bit.patch ---
>From 6ea579d79b86cff1a80899b5dcc22f4aa5a47b2b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 26 Mar 2010 04:44:55 +0100
Subject: [PATCH 3/4] Build on x86_64 without 32bit toolchain.
This disables the check for 32bit toolchain and tests that need it
(boo).
---
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 17 ++++++++++++++---
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 59f4e4c..5ef90de 100755
--- a/configure
+++ b/configure
@@ -2491,7 +2491,7 @@ if [ "$OS" = "linux" ]; then
fi
check_libcap
check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
fi
[ -n "$SETUP_WINE" ] && setup_wine
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 5b46a7e..b2d34ff 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -29,23 +29,29 @@ BLDDIRS += $(VBOX_DEVICES_TEST_OUT_DIR)
# We setup one 'other' target for executing the structure & alignment
# validation testcases. Perhaps a bit hackish, but extremely useful.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
OTHERS += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
endif
endif
+endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+endif
ifdef VBOX_WITH_RAW_MODE
#
# The testcase generator.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSizeRC
+endif
tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe
tstDeviceStructSizeRC_DEFS = VBOX_WITH_RAW_MODE
ifdef VBOX_WITH_USB
@@ -88,7 +94,9 @@ endif # VBOX_WITH_RAW_MODE
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS =
ifdef VBOX_WITH_USB
diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk
index eb051ca..3b8beb8 100644
--- a/src/VBox/VMM/testcase/Makefile.kmk
+++ b/src/VBox/VMM/testcase/Makefile.kmk
@@ -21,9 +21,15 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstAsmStructs tstGlobalConfig tstInstrEmul
+PROGRAMS += tstGlobalConfig tstInstrEmul
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
+endif
ifdef VBOX_WITH_RAW_MODE
- PROGRAMS += tstVMStructRC tstAsmStructsRC tstVMM tstVMM-HwAccm
+ PROGRAMS += tstVMM tstVMM-HwAccm
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
ifneq ($(KBUILD_TARGET),win)
PROGRAMS += tstVMMFork
endif
@@ -61,16 +67,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
#
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
OTHERS += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+ endif
endif
endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
- $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run \
+ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+endif
+TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
OTHER_CLEAN += \
--
1.7.0.1
VirtualBox-OSE-3.2.0-cpuid.patch:
Makefile.kmk | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-cpuid.patch ---
>From 07af14581c31196975426b7c777616c502656afc Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 17 May 2010 20:34:30 +0200
Subject: [PATCH 2/2] Disabling a cpuid testcase
Triggers bug in register allocation for inline asm, disabling a test
case seems to be a better solution than disabling inlining of
ASMCpuId().
Bugzilla reference: https://bugzilla.redhat.com/show_bug.cgi?id=593064
---
src/VBox/Runtime/testcase/Makefile.kmk | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/VBox/Runtime/testcase/Makefile.kmk b/src/VBox/Runtime/testcase/Makefile.kmk
index 0bd3782..b2b96a9 100644
--- a/src/VBox/Runtime/testcase/Makefile.kmk
+++ b/src/VBox/Runtime/testcase/Makefile.kmk
@@ -65,7 +65,6 @@ PROGRAMS += \
tstHandleTable \
tstRTHeapOffset \
tstRTHeapSimple \
- tstInlineAsm \
tstLdr \
tstLdrLoad \
tstRTList \
@@ -122,7 +121,6 @@ PROGRAMS.linux += \
tstRTProcWait \
tstRTProcIsRunningByName \
tstRTBitOperationsPIC3 \
- tstInlineAsmPIC \
tstInlineAsmPIC3
PROGRAMS.l4 += \
tstIoCtl
--
1.7.0.1
VirtualBox-OSE-3.2.0-noansi.patch:
Config.kmk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-noansi.patch ---
>From 8bfe9d2a26b87a767cac64fd810247ca5125432e Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 28 Apr 2010 12:11:49 +0200
Subject: [PATCH] Build as c99
On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h
contains a non-iso/ansi c inline assembly construct.
---
Config.kmk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index d15b6ac..fbd023e 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3805,7 +3805,7 @@ if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) # the gnu ld gu
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64
endif
-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=c99
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=gnu99
TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants
TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \
@@ -3821,7 +3821,7 @@ TEMPLATE_VBOXGUESTR3XORGMOD = VBox X.org Guest Module
TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
+TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=gnu99
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
ifeq ($(KBUILD_TARGET_ARCH),amd64)
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
--
1.7.0.1
VirtualBox-OSE-3.2.0-noupdate.patch:
VBoxUpdateDlg.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-noupdate.patch ---
>From 631f2a6aa525f51fa38a3b59550d80e452181e5f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 28 Apr 2010 11:53:40 +0200
Subject: [PATCH 1/4] Disable automatic check for updates
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
---
.../Frontends/VirtualBox/src/VBoxUpdateDlg.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
index c23e908..78b536d 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
@@ -183,7 +183,11 @@ void VBoxUpdateData::decode()
if (parser.size() > 1)
{
QDate date = QDate::fromString (parser [1], Qt::ISODate);
- mDate = date.isValid() ? date : QDate::currentDate();
+ if (date.isValid()) {
+ mDate = date;
+ } else {
+ mPeriodIndex = PeriodNever;
+ }
}
/* Parse 'branch' value */
--
1.7.0.1
VirtualBox-OSE-3.2.0-strings.patch:
Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
Installer/linux/VBox.sh | 11 ++++++-----
Installer/linux/virtualbox.desktop | 2 +-
VMM/VM.cpp | 9 ++++-----
4 files changed, 21 insertions(+), 21 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-strings.patch ---
>From ecb686c1fd8638b788a9979cefeb9ded7add8707 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings
With ones that (sometimes) make more sense.
---
src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
src/VBox/Installer/linux/VBox.sh | 11 ++++++-----
src/VBox/Installer/linux/virtualbox.desktop | 2 +-
src/VBox/VMM/VM.cpp | 8 ++++----
4 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp
index ecb461f..42c5188 100644
--- a/src/VBox/Frontends/VirtualBox/src/main.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/main.cpp
@@ -73,13 +73,13 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
- "package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+ "loaded.<br/><br/>"
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges:<br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -93,7 +93,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
"may correct this. Make sure that you do not mix the "
"OSE version and the PUEL version of VirtualBox."
);
@@ -102,9 +102,9 @@ QString g_QStrHintOtherNoDriver = QApplication::tr(
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
- "Please try reinstalling VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh
index 27fb7e9..c32fdbe 100644
--- a/src/VBox/Installer/linux/VBox.sh
+++ b/src/VBox/Installer/linux/VBox.sh
@@ -32,19 +32,20 @@ elif ! lsmod|grep -q vboxdrv; then
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+ load. Reboot the computer, or insert the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevtrigger' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
+ can not possibly happen and there's nothing you can do about it.
You will not be able to start VMs until this problem is fixed.
EOF
diff --git a/src/VBox/Installer/linux/virtualbox.desktop b/src/VBox/Installer/linux/virtualbox.desktop
index c05588d..d931435 100644
--- a/src/VBox/Installer/linux/virtualbox.desktop
+++ b/src/VBox/Installer/linux/virtualbox.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
-Name=Oracle VM VirtualBox
+Name=VirtualBox OSE
GenericName=Virtual Machine
Type=Application
Exec=VirtualBox
diff --git a/src/VBox/VMM/VM.cpp b/src/VBox/VMM/VM.cpp
index ac131ac..e4077ad 100644
--- a/src/VBox/VMM/VM.cpp
+++ b/src/VBox/VMM/VM.cpp
@@ -332,8 +332,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PFNVMATERROR pfnVMAtError, void *pvU
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer, or insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -374,8 +374,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PFNVMATERROR pfnVMAtError, void *pvU
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
--
1.7.0.1
VirtualBox-OSE-3.2.0-visibility.patch:
Config.kmk | 2 +-
src/VBox/Main/webservice/websrv-nsmap.xsl | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-visibility.patch ---
>From 3125491b7c943a8ea6b89ea71eaf282f8575a9cc Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 17 May 2010 20:33:52 +0200
Subject: [PATCH 1/2] Do not hide that much
A bit more benevolent visibility. Needed on f13, still needs to be
looked into.
/usr/bin/ld: VirtualBox-3.2.0_OSE/out/linux.x86/release/obj/webtest/webtest:
hidden symbol `namespaces' in VirtualBox-3.2.0_OSE/out/linux.x86/release/obj/webtest/webtest.o
is referenced by DSO
/usr/bin/ld: final link failed: Nonrepresentable section on output
collect2: ld returned 1 exit status
---
Config.kmk | 2 +-
src/VBox/Main/webservice/websrv-nsmap.xsl | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index d0c6e88..0cb1a93 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -2717,7 +2717,7 @@ ifeq ($(KBUILD_TARGET),win)
else # the gcc guys
TEMPLATE_VBOXR3EXE_TOOL = $(VBOX_GCC_TOOL)
-TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
+TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-inlines-hidden)
TEMPLATE_VBOXR3EXE_CXXFLAGS.x86 = -m32
TEMPLATE_VBOXR3EXE_CXXFLAGS.amd64 = -m64
TEMPLATE_VBOXR3EXE_CXXFLAGS.sparc32 = -m32
diff --git a/src/VBox/Main/webservice/websrv-nsmap.xsl b/src/VBox/Main/webservice/websrv-nsmap.xsl
index c515819..2a4de13 100644
--- a/src/VBox/Main/webservice/websrv-nsmap.xsl
+++ b/src/VBox/Main/webservice/websrv-nsmap.xsl
@@ -47,6 +47,7 @@
* Generated from: src/VBox/Main/idl/VirtualBox.xidl (VirtualBox's interface definitions in XML)
* Generator: src/VBox/Main/webservice/websrv-nsmap.xsl */
+#pragma GCC visibility push(default)
#include "soapH.h"
SOAP_NMAC struct Namespace namespaces[] =
{
@@ -62,6 +63,7 @@ SOAP_NMAC struct Namespace namespaces[] =
<xsl:text><![CDATA[
{NULL, NULL, NULL, NULL}
};
+#pragma GCC visibility pop
]]></xsl:text>
</xsl:template>
--
1.7.0.1
VirtualBox-OSE-3.2.0-xorg17.patch:
vboxmouse/Makefile.kmk | 26 ++++++++++-------------
vboxvideo/Makefile.kmk | 55 +++++++++++++++++++++++++++++--------------------
2 files changed, 45 insertions(+), 36 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.0-xorg17.patch ---
>From 074b5d40bed06b697f6c99f4a14d258c24a1b51c Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 28 Apr 2010 12:04:23 +0200
Subject: [PATCH 2/4] Build drivers for XOrg 1.7 ABI
And only them.
---
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 26 +++++------
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 54 +++++++++++++++----------
2 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index da2033c..83a0b76 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -59,7 +59,7 @@ endif
#
# vboxmouse_drv_70
#
-DLLS += vboxmouse_drv_70
+#DLLS += vboxmouse_drv_70
vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_70_DEFS = \
XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
@@ -80,7 +80,7 @@ vboxmouse_drv_70_SOURCES = \
#
# vboxmouse_drv_71
#
-DLLS += vboxmouse_drv_71
+#DLLS += vboxmouse_drv_71
vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
vboxmouse_drv_71_INCS := \
@@ -112,7 +112,7 @@ vboxmouse_drv_13_SOURCES = \
#
# vboxmouse_drv_14
#
-DLLS += vboxmouse_drv_14
+#DLLS += vboxmouse_drv_14
vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_14_INCS := \
@@ -133,7 +133,7 @@ endif
#
# vboxmouse_drv_15
#
-DLLS += vboxmouse_drv_15
+#DLLS += vboxmouse_drv_15
vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_15_INCS := \
@@ -148,7 +148,7 @@ vboxmouse_drv_15_SOURCES = \
#
# vboxmouse_drv_16
#
-DLLS += vboxmouse_drv_16
+#DLLS += vboxmouse_drv_16
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \
@@ -167,15 +167,13 @@ vboxmouse_drv_16_SOURCES = \
DLLS += vboxmouse_drv_17
vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxmouse_drv_17_INCS := \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/Xext \
$(PATH_SUB_CURRENT)
vboxmouse_drv_17_SOURCES = \
vboxmouse_15.c
@@ -203,7 +201,7 @@ vboxmouse_drv_18_SOURCES = \
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 41d5f80..118fc83 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -83,7 +83,7 @@ endif # target linux
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a properity.
#
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -106,7 +106,7 @@ vboxvideo_drv_70_SOURCES = \
#
# vboxvideo_drv_71
#
-DLLS += vboxvideo_drv_71
+#DLLS += vboxvideo_drv_71
vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -122,7 +122,7 @@ vboxvideo_drv_71_SOURCES = \
#
# vboxvideo_drv_13
#
-DLLS += vboxvideo_drv_13
+#DLLS += vboxvideo_drv_13
vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
@@ -145,7 +145,7 @@ vboxvideo_drv_13_SOURCES = \
# This uses the same code (vboxvideo_13.c) as 1.3, but is built
# for 1.4 as well in case there should be any relevant header changes.
#
-DLLS += vboxvideo_drv_14
+#DLLS += vboxvideo_drv_14
vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
@@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES = \
#
# vboxvideo_drv_15
#
-DLLS += vboxvideo_drv_15
+#DLLS += vboxvideo_drv_15
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
@@ -193,7 +193,7 @@ endif
#
# vboxvideo_drv_16
#
-DLLS += vboxvideo_drv_16
+#DLLS += vboxvideo_drv_16
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source \
+ /usr/share/xorg-x11-server-source/fb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dri \
+ /usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+ /usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/modes \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+ /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+ /usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/miext/damage \
+ /usr/share/xorg-x11-server-source/randr \
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
@@ -263,7 +275,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--
1.7.0.1
VirtualBox-OSE-3.2.4-libcxx.patch:
Config.kmk | 2 -
configure | 2 -
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 34 +++++++++++--------------
3 files changed, 17 insertions(+), 21 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.4-libcxx.patch ---
>From 7bfae220df8bfa772480ab5f860c46b06dcdf9fb Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 18 Jun 2010 10:58:14 +0200
Subject: [PATCH] Do not include statically linked libstdc++
Not a good idea if we don't need to be binary-compatible across exotic
distribution. Doesn't work with trunk glibc heading towards 2.11 anyways.
Static linking is not really supported anyways.
---
Config.kmk | 2 +-
configure | 2 +-
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 33 +++++++++++-------------
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index 1dc7c3f..a58046e 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -2778,7 +2778,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl
TEMPLATE_VBOXR3EXE_LIBS = \
$(L4_LIBDIR)/libvboxserver.s.so \
$(L4_LIBDIR)/libuc++.0.s.so \
- supc++ gcc_eh gcc \
+ stdc++ \
$(L4_LIBDIR)/libdl.s.so \
$(L4_LIBDIR)/libuc.0.s.so
else ifeq ($(KBUILD_TARGET),os2)
diff --git a/configure b/configure
index ad35434..48d7a94 100755
--- a/configure
+++ b/configure
@@ -2445,7 +2445,7 @@ fi
if [ "$OS" = "linux" ]; then
# don't check for the static libstdc++ in the PUEL version as we build the
# additions at a dedicated box
- [ $OSE -ge 1 ] && check_staticlibstdcxx
+ #[ $OSE -ge 1 ] && check_staticlibstdcxx
if [ $WITH_KMODS -eq 1 ]; then
check_linux
else
diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
index 015a847..627f659 100644
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
@@ -50,10 +50,7 @@ VBoxClient_LIBS = \
X11 \
Xrandr \
Xt
-# These are static replacements for gcc-specific parts of libstdc++
-VBoxClient_LIBS += \
- supc++ \
- gcc_eh
+VBoxClient_LIBS += stdc++
ifdef VBOX_X11_SEAMLESS_GUEST
VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
VBoxClient_SOURCES += \
@@ -69,20 +66,20 @@ endif
ifdef VBOX_WITH_GUEST_PROPS
VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
endif
-#
-# Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
-# (It would've been preferred to avoid features depending on libstdc++, of course...)
-#
-# Actually, this is darn annoying and will *NOT* be tolerated for any new code!
-#
-VBoxClient_LIBPATH += $(PATH_VBoxClient)
-VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
-VBoxClient_CLEAN = $(PATH_VBoxClient)/libstdc++.a
-$$(PATH_VBoxClient)/libstdc++.a:
- $(call MSG_L1,Forcing static libstdc++)
- $(QUIET)$(MKDIR) -p $(@D)
- $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
- || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
+##
+## Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
+## (It would've been preferred to avoid features depending on libstdc++, of course...)
+##
+## Actually, this is darn annoying and will *NOT* be tolerated for any new code!
+##
+#VBoxClient_LIBPATH += $(PATH_VBoxClient)
+#VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
+#VBoxClient_CLEAN = $(PATH_VBoxClient)/libstdc++.a
+#$$(PATH_VBoxClient)/libstdc++.a:
+# $(call MSG_L1,Forcing static libstdc++)
+# $(QUIET)$(MKDIR) -p $(@D)
+# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \
+# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@
ifdef VBOX_X11_SEAMLESS_GUEST
if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
--
1.7.0.1
VirtualBox-OSE-3.2.4-optflags.patch:
Config.kmk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.4-optflags.patch ---
>From 24e7fcad278bbc5a79179e37bcf04c483c4c25b0 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 14 May 2010 12:26:33 +0200
Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer.
Seems like this patch could be safely left out.
---
Config.kmk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index 6042296..f44dee1 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3514,7 +3514,7 @@ ifdef VBOX_WITH_QTGUI
$(LIB_SDL_INC)
## @todo Use VBOX_GCC_PEDANTIC_CXX?
TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
- -g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \
+ $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \
-Wno-long-long -fshort-wchar -fno-strict-aliasing \
$(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.x86 = -m32
--
1.7.0.1
VirtualBox-OSE-3.2.6-acpi.patch:
vbox.dsl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.6-acpi.patch ---
svn log -c30593 http://www.virtualbox.org/svn/vbox/trunk
------------------------------------------------------------------------
r30593 | vboxsync | 2010-07-04 07:10:31 -0400 (Sun, 04 Jul 2010) | 1 line
vbox.dsl: Fix compilation with newer iasl versions (Contributed by Jung-uk Kim and Bernhard Froehlich)
------------------------------------------------------------------------
svn diff -c30593 http://www.virtualbox.org/svn/vbox/trunk
Index: src/VBox/Devices/PC/vbox.dsl
===================================================================
--- src/VBox/Devices/PC/vbox.dsl (revision 30592)
+++ src/VBox/Devices/PC/vbox.dsl (revision 30593)
@@ -986,7 +986,7 @@
// (all of low memory space)
ResourceProducer, // bit 0 of general flags is 0
PosDecode, // positive Decode
- MinFixed, // Range is fixed
+ MinNotFixed, // Range is not fixed
MaxFixed, // Range is fixed
Cacheable,
ReadWrite,
@@ -995,7 +995,7 @@
0xffdfffff, // Max = 4GB - 2MB
0x00000000, // Translation
- 0xdfdfffff, // Range Length (calculated
+ 0x00000000, // Range Length (calculated
// dynamically)
, // Optional field left blank
, // Optional field left blank
VirtualBox-OSE-3.2.6-gcc45.patch:
PGMAllGst.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE VirtualBox-OSE-3.2.6-gcc45.patch ---
>From 8c4aca59bd1db2fa278a575e7768ce129a89013d Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 12 Jul 2010 10:01:48 +0200
Subject: [PATCH] Fix build with GCC 4.5.0
Silence an -Wuninitialized warning which causes the build to fail,
because we build with -Werror.
---
src/VBox/VMM/VMMAll/PGMAllGst.h | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/VBox/VMM/VMMAll/PGMAllGst.h b/src/VBox/VMM/VMMAll/PGMAllGst.h
index 749fffd..6aea35a 100644
--- a/src/VBox/VMM/VMMAll/PGMAllGst.h
+++ b/src/VBox/VMM/VMMAll/PGMAllGst.h
@@ -81,6 +81,13 @@ PGM_GST_DECL(int, GetPage)(PVMCPU pVCpu, RTGCPTR GCPtr, uint64_t *pfFlags, PRTGC
X86PDPE Pdpe;
X86PDEPAE Pde = pgmGstGetLongModePDEEx(&pVCpu->pgm.s, GCPtr, &pPml4e, &Pdpe);
+ Pdpe.n.u1Present =
+ Pdpe.lm.u1Write =
+ Pdpe.lm.u1User =
+ Pdpe.lm.u1Accessed =
+ Pdpe.lm.u1NoExecute =
+ 0;
+
Assert(pPml4e);
if (!(pPml4e->n.u1Present & Pdpe.n.u1Present))
return VERR_PAGE_TABLE_NOT_PRESENT;
--
1.7.1.1
VirtualBox-OSE-3.2.6-vboxkeyboard.patch:
Makefile.kmk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.6-vboxkeyboard.patch ---
>From 53aff8d4da4230619ecd2c029e2b991dccd2e47b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Mon, 12 Jul 2010 01:52:39 -0400
Subject: [PATCH] Look for VBoxKeyboard files wherever were they created
*_INST causes the files to be created in PATH_INS, not PATH_TARGET. This
fixes a build failure when the two are different.
tar --owner 0 --group 0 --ignore-failed-read -cjRf /br/VirtualBox-3.2.6_OSE/obj/bin/vboxkeyboard.tar.bz2 \
-C /br/VirtualBox-3.2.6_OSE/out/linux.x86/release/obj/VBoxKeyboard/install VBoxKeyboard
tar: /br/VirtualBox-3.2.6_OSE/out/linux.x86/release/obj/VBoxKeyboard/install: Cannot chdir: No such file or directory
tar: Error is not recoverable: exiting now
---
.../Frontends/Common/VBoxKeyboard/Makefile.kmk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
index b88b1c1..9d57e09 100644
--- a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
+++ b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk
@@ -45,12 +45,12 @@ VBoxKeyboard_LIBPATH = $(VBOX_LIBPATH_X11)
# but wtf, it's not like we're even trying to be FHS compliant).
#
## @todo this should be tar'ed down into the output directory and installed using an install target.
-VBOX_KEYBOARD_STAGE_DIR = $(PATH_TARGET)/VBoxKeyboard/install
+VBOX_KEYBOARD_STAGE_DIR = $(PATH_INS)/VBoxKeyboard/install
VBOX_KEYBOARD_DEST_DIR = $(VBOX_KEYBOARD_STAGE_DIR)/VBoxKeyboard/
INSTALLS += VBoxKeyboard-Files
-VBoxKeyboard-Files_INST = $(subst $(PATH_TARGET),obj,$(VBOX_KEYBOARD_DEST_DIR))
+VBoxKeyboard-Files_INST = $(subst $(PATH_INS)/,,$(VBOX_KEYBOARD_DEST_DIR))
VBoxKeyboard-Files_MODE = a+rx,u+w
VBoxKeyboard-Files_SOURCES = \
COPYING.LIB \
--
1.7.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 10 May 2010 12:37:45 -0000 1.16
+++ .cvsignore 13 Jul 2010 07:23:15 -0000 1.17
@@ -1,2 +1,2 @@
-VirtualBox-3.1.8-OSE.tar.bz2
UserManual.pdf
+VirtualBox-3.2.6-OSE.tar.bz2
Index: VirtualBox-OSE-guest.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/VirtualBox-OSE-guest.modules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-OSE-guest.modules 18 May 2010 16:23:57 -0000 1.5
+++ VirtualBox-OSE-guest.modules 13 Jul 2010 07:23:16 -0000 1.6
@@ -4,7 +4,7 @@
insert_module ()
{
grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
- modinfo $1 |awk '/filename:/ {print $2}' |xargs -r insmod
+ modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL
}
insert_module vboxguest
Index: VirtualBox-OSE.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/VirtualBox-OSE.modules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-OSE.modules 26 Mar 2010 13:18:54 -0000 1.5
+++ VirtualBox-OSE.modules 13 Jul 2010 07:23:16 -0000 1.6
@@ -9,7 +9,7 @@
insert_module ()
{
grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
- modinfo $1 |awk '/filename:/ {print $2}' |xargs -r insmod
+ modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL
}
insert_module vboxdrv
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/VirtualBox-OSE.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- VirtualBox-OSE.spec 18 May 2010 16:23:57 -0000 1.49
+++ VirtualBox-OSE.spec 13 Jul 2010 07:23:16 -0000 1.50
@@ -6,30 +6,41 @@
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
+# In prerelease builds (such as betas), this package has the same
+# major version number, while the kernel module abi is not guarranteed
+# to be stable. This is so that we force the module update in sync with
+# userspace.
+#global prerel beta3
+%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+
Name: VirtualBox-OSE
-Version: 3.1.8
-Release: 2%{?dist}
+Version: 3.2.6
+Release: 2%{?prerel:.%{prerel}%{?dist}}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
License: GPLv2 or (GPLv2 and CDDL)
URL: http://www.virtualbox.org/wiki/VirtualBox
-Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version}-OSE.tar.bz2
-Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+Source0: http://download.virtualbox.org/download/%{version}%{?prereltag}/VirtualBox-%{version}%{?prereltag}-OSE.tar.bz2
+Source1: http://download.virtualbox.org/download/%{version}%{?prereltag}/UserManual.pdf
Source3: VirtualBox-OSE-90-vboxdrv.rules
Source5: VirtualBox-OSE-60-vboxguest.rules
Source6: VirtualBox-OSE.modules
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
-Source9: VirtualBox-OSE.blacklist-kvm
-Patch1: VirtualBox-OSE-3.1.0-noupdate.patch
-Patch2: VirtualBox-OSE-3.1.0-strings.patch
-Patch3: VirtualBox-OSE-3.1.0-libcxx.patch
-Patch5: VirtualBox-OSE-3.1.8-xorg17.patch
-Patch9: VirtualBox-OSE-3.0.4-optflags.patch
-Patch10: VirtualBox-OSE-3.1.6-32bit.patch
-Patch11: VirtualBox-OSE-3.1.0-visibility.patch
-Patch12: VirtualBox-OSE-3.0.4-noansi.patch
+Source9: VirtualBox-OSE-00-vboxvideo.conf
+Patch1: VirtualBox-OSE-3.2.0-noupdate.patch
+Patch2: VirtualBox-OSE-3.2.0-strings.patch
+Patch3: VirtualBox-OSE-3.2.4-libcxx.patch
+Patch5: VirtualBox-OSE-3.2.0-xorg17.patch
+Patch9: VirtualBox-OSE-3.2.4-optflags.patch
+Patch10: VirtualBox-OSE-3.2.0-32bit.patch
+Patch11: VirtualBox-OSE-3.2.0-visibility.patch
+Patch12: VirtualBox-OSE-3.2.0-noansi.patch
+Patch13: VirtualBox-OSE-3.2.0-cpuid.patch
+Patch14: VirtualBox-OSE-3.2.6-vboxkeyboard.patch
+Patch15: VirtualBox-OSE-3.2.6-gcc45.patch
+Patch16: VirtualBox-OSE-3.2.6-acpi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,17 +59,19 @@
BuildRequires: qt4-devel
BuildRequires: gsoap-devel
BuildRequires: xz
+BuildRequires: pam-devel
# For the X11 module
BuildRequires: libdrm-devel
BuildRequires: libpciaccess-devel
BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libOSMesa-devel
BuildRequires: pixman-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-server-source
# Plague-specific weirdness
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
ExclusiveArch: i586 x86_64
@@ -66,8 +79,9 @@
ExclusiveArch: i386 x86_64
%endif
-Requires: %{name}-kmod = %{version}
-Provides: %{name}-kmod-common = %{version}
+Requires: %{name}-kmod = %{version}%{?prereltag}
+Provides: %{name}-kmod-common = %{version}%{?prereltag}
+Conflicts: %{name}-guest <= %{version}-%{release}
%description
A general-purpose full virtualizer and emulator for 32-bit and
@@ -103,6 +117,7 @@
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
+Conflicts: %{name} <= %{version}-%{release}
%description guest
Tools that utilize kernel modules for supporting integration
@@ -131,6 +146,10 @@
%patch10 -p1 -b .32bit
%patch11 -p1 -b .visibility
%patch12 -p1 -b .noansi
+%patch13 -p1 -b .cpuid
+%patch14 -p1 -b .vboxkeyboard
+%patch15 -p1 -b .gcc45
+%patch16 -p0 -b .acpi
# Remove prebuilt binary tools
rm -rf kBuild
@@ -155,7 +174,7 @@
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \
VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
- VBOX_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL"
+ VBOX_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
%install
@@ -165,6 +184,7 @@
# the commercially supported version to minimize confusion
# Directory structure
+install -d $RPM_BUILD_ROOT/%{_lib}/security
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
@@ -200,7 +220,11 @@
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
-# Executabes
+# Documentation
+install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+ %{SOURCE1}
+
+# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/EfiThunk \
obj/bin/VBoxHeadless \
@@ -243,6 +267,7 @@
install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+# This is no longer needed for a more recent Xorg, since evdev uses udev
install -m 0755 -D src/VBox/Additions/linux/installer/90-vboxguest.fdi \
$RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
@@ -253,6 +278,10 @@
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
+# Ideally, Xorg should autodetect this, but for some reason it no longer does
+install -m 0755 -D %{SOURCE9} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
+
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -270,6 +299,9 @@
obj/bin/additions/VBoxOGL*.so
ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
+install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \
+ obj/bin/additions/pam_vbox.so
+
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
@@ -281,7 +313,6 @@
# Install modules load script
install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
-install -p -m 0644 -D %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-kvm.conf
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -313,13 +344,15 @@
diff -u <((find obj/bin/additions/* -maxdepth 0 -type f \
-not -name 'autorun.sh' \
-not -name '*_drv*' \
+ -not -name 'pam_vbox.so' \
-exec basename '{}' \;
find obj/bin/* -maxdepth 0 -type f \
-not -name 'tst*' \
-not -name 'SUP*' \
-not -name 'VBox.sh' \
-not -name 'xpidl' \
- -not -name 'vboxkeyboard.tar.gz' \
+ -not -name 'scm' \
+ -not -name 'vboxkeyboard.tar.*' \
-exec basename '{}' \;) |sort) \
<(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \
$RPM_BUILD_ROOT%{_bindir}/* \
@@ -327,6 +360,7 @@
$RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
-maxdepth 0 -type f \
-not -name '*.py[co]' \
+ -not -name 'UserManual.pdf' \
-not -name VBox -exec basename '{}' \; |sort)
set -o posix
@@ -357,7 +391,9 @@
%{_bindir}/VBoxTunctl
%{_bindir}/VirtualBox
%dir %{_libdir}/virtualbox
-%{_libdir}/virtualbox/*.*
+%doc %{_libdir}/virtualbox/*.pdf
+%{_libdir}/virtualbox/*.[^p]*
+%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
%{_libdir}/virtualbox/nls
%{_libdir}/virtualbox/VBoxManage
@@ -378,8 +414,7 @@
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%config(noreplace) %{_sysconfdir}/modprobe.d/*.conf
-%doc COPYING UserManual.pdf
+%doc COPYING
%files devel
@@ -394,6 +429,7 @@
%files guest
%defattr(-,root,root,-)
+/%{_lib}/security/pam_vbox.so
%{_bindir}/mount.vboxsf
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
@@ -401,6 +437,7 @@
%{_libdir}/xorg/modules/drivers/*
%{_libdir}/dri/*
%{_libdir}/VBoxOGL*.so
+%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
@@ -416,12 +453,34 @@
%changelog
-* Tue May 18 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.8-2
-- Rename the shared folders module
+* Tue Jul 13 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.6-2
+- Ship with Xorg configuration
-* Mon May 10 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.8-1
-- New upstream release
-- VBoxRandr no more
+* Mon Jul 12 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.6-1
+- New release, fix build
+- Fix compile with GCC 4.5
+- Fix acpi compilation with newer iasl
+
+* Thu Jun 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.4-1
+- New release
+- Do not use /usr/bin/xargs in module script (Piergiorgio Sartor, #1256)
+- No longer blacklist KVM (Nicolas Chauvet, #1280)
+- Hypervisor conflicts with guest (Henrique Martins, #1239)
+
+* Wed May 19 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-1
+- Release
+
+* Fri May 14 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-0.2.beta3
+- Beta 3
+- Add a release status tag into kernel abi dependency
+
+* Mon May 10 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-0.2.beta2
+- 3.2.0 beta2
+- Move pdf documentation to libdir, so that UI can find it
+
+* Wed Apr 28 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.2.0-0.1.beta1
+- 3.2.0 beta
+- Build i686 on el6
* Fri Mar 26 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.6-1
- New upstream release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 10 May 2010 12:37:45 -0000 1.17
+++ sources 13 Jul 2010 07:23:16 -0000 1.18
@@ -1,2 +1,2 @@
-93b5caaac8571591c21b679987cbe518 VirtualBox-3.1.8-OSE.tar.bz2
-09b98518de7eee5935aa4cc902195cbe UserManual.pdf
+9c3f21a2011aa4c041f146df90359470 UserManual.pdf
+65b822ab3c08ff882d9621101996dc14 VirtualBox-3.2.6-OSE.tar.bz2
--- VirtualBox-OSE-3.0.4-noansi.patch DELETED ---
--- VirtualBox-OSE-3.0.4-optflags.patch DELETED ---
--- VirtualBox-OSE-3.1.0-libcxx.patch DELETED ---
--- VirtualBox-OSE-3.1.0-noupdate.patch DELETED ---
--- VirtualBox-OSE-3.1.0-strings.patch DELETED ---
--- VirtualBox-OSE-3.1.0-visibility.patch DELETED ---
--- VirtualBox-OSE-3.1.6-32bit.patch DELETED ---
--- VirtualBox-OSE-3.1.8-xorg17.patch DELETED ---
--- VirtualBox-OSE-90-vboxdrv.rules.hardening DELETED ---
--- VirtualBox-OSE.blacklist-kvm DELETED ---
More information about the rpmfusion-commits
mailing list