rpms/VirtualBox-OSE/F-13 VirtualBox-OSE-3.1.6-32bit.patch, NONE,
1.1 VirtualBox-OSE-guest.modules, 1.3,
1.4 VirtualBox-OSE.modules, 1.4, 1.5 VirtualBox-OSE.spec, 1.45,
1.46 sources, 1.15, 1.16 VirtualBox-OSE-2.2.0-32bit.patch, 1.1, NONE
Lubomir Rintel
lkundrak at rpmfusion.org
Fri Mar 26 14:18:54 CET 2010
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26664
Modified Files:
VirtualBox-OSE-guest.modules VirtualBox-OSE.modules
VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.1.6-32bit.patch
Removed Files:
VirtualBox-OSE-2.2.0-32bit.patch
Log Message:
Merge from devel
VirtualBox-OSE-3.1.6-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.1.6-32bit.patch ---
>From c54ef4d0f82d1aa7e0e3bf370265cdf569b1dc26 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] 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 2a29643..69bdc28 100755
--- a/configure
+++ b/configure
@@ -2345,7 +2345,7 @@ if [ "$OS" = "linux" ]; then
fi
check_libcap
check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
+ #[ "$BUILD_MACHINE" = "amd64" ] && 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 2f3e157..cce43ae 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -33,23 +33,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 = VBOXGCEXE
tstDeviceStructSizeRC_DEFS = VBOX_WITH_RAW_MODE
ifdef VBOX_WITH_USB
@@ -92,7 +98,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 89b5203..9149ffe 100644
--- a/src/VBox/VMM/testcase/Makefile.kmk
+++ b/src/VBox/VMM/testcase/Makefile.kmk
@@ -25,9 +25,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
@@ -65,16 +71,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
Index: VirtualBox-OSE-guest.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/VirtualBox-OSE-guest.modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox-OSE-guest.modules 12 Nov 2009 16:47:53 -0000 1.3
+++ VirtualBox-OSE-guest.modules 26 Mar 2010 13:18:54 -0000 1.4
@@ -1,3 +1,12 @@
#!/bin/sh
-/sbin/modprobe -b vboxguest &>/dev/null
-/sbin/modprobe -b vboxvfs &>/dev/null
+
+# Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083
+insert_module ()
+{
+ grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
+ modinfo $1 |awk '/filename:/ {print $2}' |xargs -r insmod
+}
+
+insert_module vboxguest
+insert_module vboxvfs
+
Index: VirtualBox-OSE.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/VirtualBox-OSE.modules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VirtualBox-OSE.modules 17 Aug 2009 03:29:11 -0000 1.4
+++ VirtualBox-OSE.modules 26 Mar 2010 13:18:54 -0000 1.5
@@ -2,9 +2,16 @@
# User is advised to run this on upgrades
/sbin/modprobe -r -b vboxnetflt &>/dev/null ||:
-/sbin/modprobe -r -b vboxdrv &>/dev/null ||:
/sbin/modprobe -r -b vboxnetadp &>/dev/null ||:
+/sbin/modprobe -r -b vboxdrv &>/dev/null ||:
+
+# Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083
+insert_module ()
+{
+ grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return
+ modinfo $1 |awk '/filename:/ {print $2}' |xargs -r insmod
+}
-/sbin/modprobe -b vboxdrv
-/sbin/modprobe -b vboxnetflt
-/sbin/modprobe -b vboxnetadp
+insert_module vboxdrv
+insert_module vboxnetflt
+insert_module vboxnetadp
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/VirtualBox-OSE.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- VirtualBox-OSE.spec 16 Feb 2010 21:37:30 -0000 1.45
+++ VirtualBox-OSE.spec 26 Mar 2010 13:18:54 -0000 1.46
@@ -1,13 +1,13 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
# Standard compiler flags, without:
-# -Wall -- VirtualBox-OSE takes care of reasonable warning very well
+# -Wall -- VirtualBox-OSE takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
# -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//')
Name: VirtualBox-OSE
-Version: 3.1.4
+Version: 3.1.6
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -27,7 +27,7 @@
Patch3: VirtualBox-OSE-3.1.0-libcxx.patch
Patch5: VirtualBox-OSE-3.1.0-xorg17.patch
Patch9: VirtualBox-OSE-3.0.4-optflags.patch
-Patch10: VirtualBox-OSE-2.2.0-32bit.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
@@ -141,8 +141,7 @@
%build
-./configure --disable-kmods --enable-webservice \
-
+./configure --disable-kmods --enable-webservice
. ./env.sh
# VirtualBox build system installs and builds in the same step,
@@ -151,11 +150,12 @@
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
echo %{optflags}
-kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \
+kmk %{_smp_mflags} \
+ KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \
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_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL"
%install
@@ -284,7 +284,7 @@
# 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}/sysconfig/modprobe.d/blacklist-kvm.conf
+install -p -m 0644 -D %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/blacklist-kvm.conf
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -378,10 +378,11 @@
%attr(4755,root,root) %{_libdir}/virtualbox/VirtualBox
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
+%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%config(noreplace) %{_sysconfdir}/sysconfig/modprobe.d/*.conf
+%config(noreplace) %{_sysconfdir}/modprobe.d/*.conf
%doc COPYING UserManual.pdf
@@ -420,6 +421,14 @@
%changelog
+* Fri Mar 26 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.6-1
+- New upstream release
+- Workaround trouble linking with new linker
+- modprobe configuration files into right directory (LI Rui Bin)
+- Own /etc/vbox (LI Rui Bin)
+- Use parallel build
+- Attempt to address #1083 by insmodding instead of modprobe
+
* Tue Feb 16 2010 Lubomir Rintel <lkundrak at v3.sk> - 3.1.4-1
- New upstream, new release :)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 16 Feb 2010 21:37:30 -0000 1.15
+++ sources 26 Mar 2010 13:18:54 -0000 1.16
@@ -1,2 +1,2 @@
-4ceede379f68905b0a0d87c11a22b0e4 UserManual.pdf
-d32066cb9ebfa4930a2c5ad6227de26f VirtualBox-3.1.4-OSE.tar.bz2
+6cb3c8161ad878c2a2732137c1621dc4 VirtualBox-3.1.6-OSE.tar.bz2
+8561a2b883fbede1e93b7dfb2238e7cc UserManual.pdf
--- VirtualBox-OSE-2.2.0-32bit.patch DELETED ---
More information about the rpmfusion-commits
mailing list