Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14323 Modified Files: .cvsignore VirtualBox-OSE-guest.modules VirtualBox-OSE.spec sources Added Files: VirtualBox-OSE-3.2.0-cpuid.patch VirtualBox-OSE-3.2.0-optflags.patch VirtualBox-OSE-3.2.0-visibility.patch Removed Files: VirtualBox-OSE-3.0.4-optflags.patch VirtualBox-OSE-3.1.0-visibility.patch Log Message: Beta 3 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: Lubomir Rintel <lkundrak(a)v3.sk&gt; 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-optflags.patch: Config.kmk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE VirtualBox-OSE-3.2.0-optflags.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; 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 823dbf4..83555a0 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3499,7 +3499,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.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: Lubomir Rintel <lkundrak(a)v3.sk&gt; 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 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 10 May 2010 08:23:27 -0000 1.19 +++ .cvsignore 18 May 2010 16:51:38 -0000 1.20 @@ -1,2 +1,2 @@ -VirtualBox-3.2.0_BETA2-OSE.tar.bz2 +VirtualBox-3.2.0_BETA3-OSE.tar.bz2 UserManual.pdf Index: VirtualBox-OSE-guest.modules =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-guest.modules,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- VirtualBox-OSE-guest.modules 26 Mar 2010 13:14:23 -0000 1.4 +++ VirtualBox-OSE-guest.modules 18 May 2010 16:51:38 -0000 1.5 @@ -8,5 +8,5 @@ } insert_module vboxguest -insert_module vboxvfs +insert_module vboxsf Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- VirtualBox-OSE.spec 10 May 2010 12:03:59 -0000 1.50 +++ VirtualBox-OSE.spec 18 May 2010 16:51:38 -0000 1.51 @@ -6,16 +6,24 @@ # -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 %{nil} +%global prerel beta3 +%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} + Name: VirtualBox-OSE Version: 3.2.0 -Release: 0.2.beta2%{?dist} +Release: 0.3%{?prerelease:.%{prerelease}%{?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/download/%{version}_BETA2/VirtualBox-%{ver... -Source1: http://download.virtualbox.org/download/%{version}_BETA2/UserManual.pdf +Source0: http://download.virtualbox.org/download/%{version}%{?prereltag}/VirtualBo... +Source1: http://download.virtualbox.org/download/%{version}%{?prereltag}/UserManua... Source3: VirtualBox-OSE-90-vboxdrv.rules Source5: VirtualBox-OSE-60-vboxguest.rules Source6: VirtualBox-OSE.modules @@ -26,10 +34,11 @@ Patch2: VirtualBox-OSE-3.2.0-strings.patch Patch3: VirtualBox-OSE-3.1.0-libcxx.patch Patch5: VirtualBox-OSE-3.2.0-xorg17.patch -Patch9: VirtualBox-OSE-3.0.4-optflags.patch +Patch9: VirtualBox-OSE-3.2.0-optflags.patch Patch10: VirtualBox-OSE-3.2.0-32bit.patch -Patch11: VirtualBox-OSE-3.1.0-visibility.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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,8 +77,8 @@ 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} %description A general-purpose full virtualizer and emulator for 32-bit and @@ -133,6 +142,7 @@ %patch10 -p1 -b .32bit %patch11 -p1 -b .visibility %patch12 -p1 -b .noansi +%patch13 -p1 -b .cpuid # Remove prebuilt binary tools rm -rf kBuild @@ -432,6 +442,10 @@ %changelog +* Fri May 14 2010 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.2.0-0.2.beta3 +- Beta 3 +- Add a release satus tag into kernel abi dependency + * Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.2.0-0.2.beta2 - 3.2.0 beta2 - Move pdf documentation to libdir, so that UI can find it Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 10 May 2010 08:23:27 -0000 1.19 +++ sources 18 May 2010 16:51:38 -0000 1.20 @@ -1,2 +1,2 @@ -076fdc33e0cbee97a840e0043b23f746 VirtualBox-3.2.0_BETA2-OSE.tar.bz2 -64a90bef7f4e27266648e1a83928ce4d UserManual.pdf +912180888aebf749e24faa3fc26385f9 VirtualBox-3.2.0_BETA3-OSE.tar.bz2 +89b9970e864eb2227c2d3bd11d9315fb UserManual.pdf --- VirtualBox-OSE-3.0.4-optflags.patch DELETED --- --- VirtualBox-OSE-3.1.0-visibility.patch DELETED ---