Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv11510 Modified Files: .cvsignore VirtualBox-OSE.spec sources Added Files: VirtualBox-OSE-3.2.0-32bit.patch VirtualBox-OSE-3.2.0-noansi.patch VirtualBox-OSE-3.2.0-noupdate.patch VirtualBox-OSE-3.2.0-xorg17.patch Removed Files: VirtualBox-OSE-3.0.4-noansi.patch VirtualBox-OSE-3.1.0-noupdate.patch VirtualBox-OSE-3.1.0-xorg17.patch VirtualBox-OSE-3.1.6-32bit.patch Log Message: * Wed Apr 28 2010 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.2.0-0.1.beta1 - 3.2.0 beta - Build i686 on el6 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: Lubomir Rintel <lkundrak(a)v3.sk&gt; 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-noansi.patch: Config.kmk | 4 ++-- src/libs/xpcom18a4/Makefile.kmk | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE VirtualBox-OSE-3.2.0-noansi.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Wed, 28 Apr 2010 12:11:49 +0200 Subject: [PATCH 4/4] 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 ++-- src/libs/xpcom18a4/Makefile.kmk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.kmk b/Config.kmk index 28c076c..f1d6651 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3791,7 +3791,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 = \ @@ -3807,7 +3807,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 diff --git a/src/libs/xpcom18a4/Makefile.kmk b/src/libs/xpcom18a4/Makefile.kmk index 5f5b27e..7ad05c4 100644 --- a/src/libs/xpcom18a4/Makefile.kmk +++ b/src/libs/xpcom18a4/Makefile.kmk @@ -76,7 +76,7 @@ TEMPLATE_XPCOM_CFLAGS.release = -O TEMPLATE_XPCOM_CFLAGS.profile = -O TEMPLATE_XPCOM_CFLAGS.freebsd = -pthread TEMPLATE_XPCOM_CFLAGS.l4 = -nostdinc -TEMPLATE_XPCOM_CFLAGS.linux = -pthread -ansi +TEMPLATE_XPCOM_CFLAGS.linux = -pthread TEMPLATE_XPCOM_CFLAGS.solaris = -fno-omit-frame-pointer # for now anyway. TEMPLATE_XPCOM_DEFS = MOZILLA_CLIENT=1 NDEBUG=1 _IMPL_NS_COM \ XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \ -- 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: Lubomir Rintel <lkundrak(a)v3.sk&gt; 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-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: Lubomir Rintel <lkundrak(a)v3.sk&gt; 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 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 26 Mar 2010 13:14:23 -0000 1.16 +++ .cvsignore 28 Apr 2010 16:24:48 -0000 1.17 @@ -1,2 +1,2 @@ -VirtualBox-3.1.6-OSE.tar.bz2 +VirtualBox-3.2.0_BETA1-OSE.tar.bz2 UserManual.pdf Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- VirtualBox-OSE.spec 26 Mar 2010 13:14:23 -0000 1.46 +++ VirtualBox-OSE.spec 28 Apr 2010 16:24:49 -0000 1.47 @@ -7,29 +7,35 @@ %global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//') Name: VirtualBox-OSE -Version: 3.1.6 -Release: 1%{?dist} +Version: 3.2.0 +Release: 0.1.beta1%{?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... -Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf +# You can download the binaries here: +# http://213.239.192.22/download/3.2.0_BETA1/ +# (don't worry about the IP address, this is a temporary Oracle server) +# -- From: Frank Mehnert +Source0: http://213.239.192.22/download/%{version}_BETA1/VirtualBox-%{version}_BET... +Source1: http://213.239.192.22/download/%{version}_BETA1/UserManual.pdf +#Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version... +#Source1: http://download.virtualbox.org/virtualbox/%{version}/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 +Patch1: VirtualBox-OSE-3.2.0-noupdate.patch Patch2: VirtualBox-OSE-3.1.0-strings.patch Patch3: VirtualBox-OSE-3.1.0-libcxx.patch -Patch5: VirtualBox-OSE-3.1.0-xorg17.patch +Patch5: VirtualBox-OSE-3.2.0-xorg17.patch Patch9: VirtualBox-OSE-3.0.4-optflags.patch -Patch10: VirtualBox-OSE-3.1.6-32bit.patch +Patch10: VirtualBox-OSE-3.2.0-32bit.patch Patch11: VirtualBox-OSE-3.1.0-visibility.patch -Patch12: VirtualBox-OSE-3.0.4-noansi.patch +Patch12: VirtualBox-OSE-3.2.0-noansi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,17 +54,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 @@ -165,6 +173,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 @@ -253,9 +262,6 @@ obj/bin/additions/VBoxClient \ obj/bin/additions/VBoxControl -install -m 0755 src/VBox/Additions/x11/Installer/VBoxRandR.sh \ - $RPM_BUILD_ROOT%{_bindir}/VBoxRandR - install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh @@ -273,6 +279,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 @@ -316,12 +325,14 @@ 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 'scm' \ -not -name 'vboxkeyboard.tar.gz' \ -exec basename '{}' \;) |sort) \ <(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \ @@ -330,7 +341,6 @@ $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \ -maxdepth 0 -type f \ -not -name '*.py[co]' \ - -not -name VBoxRandR \ -not -name VBox -exec basename '{}' \; |sort) set -o posix @@ -398,11 +408,11 @@ %files guest %defattr(-,root,root,-) +/%{_lib}/security/pam_vbox.so %{_bindir}/mount.vboxsf %{_bindir}/VBoxClient %{_bindir}/VBoxControl %{_bindir}/VBoxService -%{_bindir}/VBoxRandR %{_libdir}/xorg/modules/drivers/* %{_libdir}/dri/* %{_libdir}/VBoxOGL*.so @@ -421,6 +431,10 @@ %changelog +* Wed Apr 28 2010 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.2.0-0.1.beta1 +- 3.2.0 beta +- Build i686 on el6 + * Fri Mar 26 2010 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.1.6-1 - New upstream release - Workaround trouble linking with new linker Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 26 Mar 2010 13:14:23 -0000 1.16 +++ sources 28 Apr 2010 16:24:49 -0000 1.17 @@ -1,2 +1,2 @@ -6cb3c8161ad878c2a2732137c1621dc4 VirtualBox-3.1.6-OSE.tar.bz2 -8561a2b883fbede1e93b7dfb2238e7cc UserManual.pdf +8d5da7e2115346cac837edc7804d9a82 VirtualBox-3.2.0_BETA1-OSE.tar.bz2 +1c48122ac2aa89fb9b9e69ac74889ce8 UserManual.pdf --- VirtualBox-OSE-3.0.4-noansi.patch DELETED --- --- VirtualBox-OSE-3.1.0-noupdate.patch DELETED --- --- VirtualBox-OSE-3.1.0-xorg17.patch DELETED --- --- VirtualBox-OSE-3.1.6-32bit.patch DELETED ---