rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.39,1.40
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13284
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.2.beta2
- Beta 2
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- VirtualBox-OSE-kmod.spec 29 Apr 2010 09:53:09 -0000 1.39
+++ VirtualBox-OSE-kmod.spec 10 May 2010 13:34:09 -0000 1.40
@@ -12,7 +12,7 @@
Name: VirtualBox-OSE-kmod
Version: 3.2.0
-Release: 0.1.beta1%{?dist}
+Release: 0.2.beta2%{?dist}
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -92,6 +92,9 @@
%changelog
+* Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.2.beta2
+- Beta 2
+
* Thu Apr 29 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.1.beta1
- Beta
14 years, 7 months
rpms/VirtualBox-OSE/F-13 VirtualBox-OSE-3.1.8-xorg17.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 VirtualBox-OSE.spec, 1.46, 1.47 sources, 1.16, 1.17 VirtualBox-OSE-3.1.0-xorg17.patch, 1.1, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9081
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.1.8-xorg17.patch
Removed Files:
VirtualBox-OSE-3.1.0-xorg17.patch
Log Message:
* Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.8-1
- New upstream release
VirtualBox-OSE-3.1.8-xorg17.patch:
vboxmouse/Makefile.kmk | 28 +++++++++++-------------
vboxvideo/Makefile.kmk | 56 +++++++++++++++++++++++++++++--------------------
2 files changed, 47 insertions(+), 37 deletions(-)
--- NEW FILE VirtualBox-OSE-3.1.8-xorg17.patch ---
>From e2292b9d240662e72dd09bac28f0f925b0479708 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 10 May 2010 14:32:36 -0400
Subject: [PATCH] Build drivers for XOrg 1.7 ABI
And only them.
---
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 28 ++++++-------
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 55 +++++++++++++++---------
2 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index 7e646d6..8b10f5e 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -63,7 +63,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
@@ -84,7 +84,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 := \
@@ -116,7 +116,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 := \
@@ -138,7 +138,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 := \
@@ -153,7 +153,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 := \
@@ -172,15 +172,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
@@ -189,7 +187,7 @@ vboxmouse_drv_17_SOURCES = \
#
# vboxmouse_drv_18
#
-DLLS += vboxmouse_drv_18
+#DLLS += vboxmouse_drv_18
vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -208,7 +206,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 3ec486e..bd6892c 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -118,7 +118,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 += \
@@ -141,7 +141,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)
@@ -157,7 +157,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
@@ -179,7 +179,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)
@@ -198,7 +198,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 \
@@ -225,7 +225,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)
@@ -249,26 +249,39 @@ 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)/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)
#
# vboxvideo_drv_18
#
-DLLS += vboxvideo_drv_18
+#DLLS += vboxvideo_drv_18
vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -293,7 +306,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/F-13/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 16 Feb 2010 21:37:30 -0000 1.15
+++ .cvsignore 10 May 2010 12:37:45 -0000 1.16
@@ -1,2 +1,2 @@
+VirtualBox-3.1.8-OSE.tar.bz2
UserManual.pdf
-VirtualBox-3.1.4-OSE.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/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:18:54 -0000 1.46
+++ VirtualBox-OSE.spec 10 May 2010 12:37:45 -0000 1.47
@@ -7,7 +7,7 @@
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
Name: VirtualBox-OSE
-Version: 3.1.6
+Version: 3.1.8
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -25,7 +25,7 @@
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.0-xorg17.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
@@ -421,6 +421,9 @@
%changelog
+* Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.8-1
+- New upstream release
+
* Fri Mar 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.6-1
- New upstream release
- Workaround trouble linking with new linker
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 26 Mar 2010 13:18:54 -0000 1.16
+++ sources 10 May 2010 12:37:45 -0000 1.17
@@ -1,2 +1,2 @@
-6cb3c8161ad878c2a2732137c1621dc4 VirtualBox-3.1.6-OSE.tar.bz2
-8561a2b883fbede1e93b7dfb2238e7cc UserManual.pdf
+93b5caaac8571591c21b679987cbe518 VirtualBox-3.1.8-OSE.tar.bz2
+09b98518de7eee5935aa4cc902195cbe UserManual.pdf
--- VirtualBox-OSE-3.1.0-xorg17.patch DELETED ---
14 years, 7 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.49,1.50
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6600
Modified Files:
VirtualBox-OSE.spec
Log Message:
We added manual to libdir
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- VirtualBox-OSE.spec 10 May 2010 10:21:43 -0000 1.49
+++ VirtualBox-OSE.spec 10 May 2010 12:03:59 -0000 1.50
@@ -339,6 +339,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
14 years, 7 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.2.0-strings.patch, NONE, 1.1 VirtualBox-OSE-3.2.0-noansi.patch, 1.1, 1.2 VirtualBox-OSE.spec, 1.48, 1.49 VirtualBox-OSE-3.1.0-strings.patch, 1.2, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31644
Modified Files:
VirtualBox-OSE-3.2.0-noansi.patch VirtualBox-OSE.spec
Added Files:
VirtualBox-OSE-3.2.0-strings.patch
Removed Files:
VirtualBox-OSE-3.1.0-strings.patch
Log Message:
Adjust patches
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(a)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-noansi.patch:
Config.kmk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Index: VirtualBox-OSE-3.2.0-noansi.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE-3.2.0-noansi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-3.2.0-noansi.patch 28 Apr 2010 16:24:49 -0000 1.1
+++ VirtualBox-OSE-3.2.0-noansi.patch 10 May 2010 10:21:43 -0000 1.2
@@ -1,20 +1,19 @@
-From d1bc4c5b0e1dd57f798efaf04b0430e22ba27a73 Mon Sep 17 00:00:00 2001
+From 8bfe9d2a26b87a767cac64fd810247ca5125432e Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 12:11:49 +0200
-Subject: [PATCH 4/4] Build as c99
+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 ++--
- src/libs/xpcom18a4/Makefile.kmk | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ Config.kmk | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Config.kmk b/Config.kmk
-index 28c076c..f1d6651 100644
+index d15b6ac..fbd023e 100644
--- a/Config.kmk
+++ b/Config.kmk
-@@ -3791,7 +3791,7 @@ if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) # the gnu ld gu
+@@ -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
@@ -23,7 +22,7 @@
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
+@@ -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)
@@ -32,19 +31,6 @@
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
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- VirtualBox-OSE.spec 10 May 2010 08:20:13 -0000 1.48
+++ VirtualBox-OSE.spec 10 May 2010 10:21:43 -0000 1.49
@@ -23,7 +23,7 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE.blacklist-kvm
Patch1: VirtualBox-OSE-3.2.0-noupdate.patch
-Patch2: VirtualBox-OSE-3.1.0-strings.patch
+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
--- VirtualBox-OSE-3.1.0-strings.patch DELETED ---
14 years, 7 months
rpms/VirtualBox-OSE/devel .cvsignore,1.18,1.19 sources,1.18,1.19
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22585
Modified Files:
.cvsignore sources
Log Message:
* Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.2.beta2
- 3.2.0 beta2
- Move pdf documentation to libdir, so that UI can find it
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 10 May 2010 08:20:13 -0000 1.18
+++ .cvsignore 10 May 2010 08:23:27 -0000 1.19
@@ -0,0 +1,2 @@
+VirtualBox-3.2.0_BETA2-OSE.tar.bz2
+UserManual.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 10 May 2010 08:20:13 -0000 1.18
+++ sources 10 May 2010 08:23:27 -0000 1.19
@@ -0,0 +1,2 @@
+076fdc33e0cbee97a840e0043b23f746 VirtualBox-3.2.0_BETA2-OSE.tar.bz2
+64a90bef7f4e27266648e1a83928ce4d UserManual.pdf
14 years, 7 months
rpms/VirtualBox-OSE/devel .cvsignore, 1.17, 1.18 VirtualBox-OSE.spec, 1.47, 1.48 sources, 1.17, 1.18
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22237
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Log Message:
* Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.2.beta2
- 3.2.0 beta2
- Move pdf documentation to libdir, so that UI can find it
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 28 Apr 2010 16:24:48 -0000 1.17
+++ .cvsignore 10 May 2010 08:20:13 -0000 1.18
@@ -1,2 +0,0 @@
-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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- VirtualBox-OSE.spec 28 Apr 2010 16:24:49 -0000 1.47
+++ VirtualBox-OSE.spec 10 May 2010 08:20:13 -0000 1.48
@@ -8,20 +8,14 @@
Name: VirtualBox-OSE
Version: 3.2.0
-Release: 0.1.beta1%{?dist}
+Release: 0.2.beta2%{?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
-# 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
+Source0: http://download.virtualbox.org/download/%{version}_BETA2/VirtualBox-%{ver...
+Source1: http://download.virtualbox.org/download/%{version}_BETA2/UserManual.pdf
Source3: VirtualBox-OSE-90-vboxdrv.rules
Source5: VirtualBox-OSE-60-vboxguest.rules
Source6: VirtualBox-OSE.modules
@@ -209,7 +203,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 \
@@ -371,7 +369,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
@@ -393,7 +393,7 @@
%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
@@ -431,6 +431,10 @@
%changelog
+* Mon May 10 2010 Lubomir Rintel <lkundrak(a)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(a)v3.sk> - 3.2.0-0.1.beta1
- 3.2.0 beta
- Build i686 on el6
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 28 Apr 2010 16:24:49 -0000 1.17
+++ sources 10 May 2010 08:20:13 -0000 1.18
@@ -1,2 +0,0 @@
-8d5da7e2115346cac837edc7804d9a82 VirtualBox-3.2.0_BETA1-OSE.tar.bz2
-1c48122ac2aa89fb9b9e69ac74889ce8 UserManual.pdf
14 years, 7 months
rpms/rt2860-kmod/devel rt2860-kmod.spec,1.54,1.55
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19204
Modified Files:
rt2860-kmod.spec
Log Message:
re-enable define buildforkernels newest
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/devel/rt2860-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- rt2860-kmod.spec 7 May 2010 07:10:25 -0000 1.54
+++ rt2860-kmod.spec 8 May 2010 07:23:35 -0000 1.55
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: rt2860-kmod
Version: 2.3.0.0
14 years, 7 months
rpms/rt2860-kmod/F-13 rt2860-kmod.spec,1.58,1.59
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19177
Modified Files:
rt2860-kmod.spec
Log Message:
re-enable define buildforkernels newest
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-13/rt2860-kmod.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- rt2860-kmod.spec 7 May 2010 07:14:50 -0000 1.58
+++ rt2860-kmod.spec 8 May 2010 07:23:17 -0000 1.59
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: rt2860-kmod
Version: 2.3.0.0
14 years, 7 months
rpms/rt2860-kmod/F-12 rt2860-kmod.spec,1.75,1.76
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19144
Modified Files:
rt2860-kmod.spec
Log Message:
re-enable define buildforkernels newest
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-12/rt2860-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- rt2860-kmod.spec 7 May 2010 07:17:02 -0000 1.75
+++ rt2860-kmod.spec 8 May 2010 07:22:47 -0000 1.76
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: rt2860-kmod
Version: 2.3.0.0
14 years, 7 months
rpms/rt2860-kmod/F-11 rt2860-kmod.spec,1.66,1.67
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/rt2860-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19112
Modified Files:
rt2860-kmod.spec
Log Message:
re-enable define buildforkernels newest
Index: rt2860-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2860-kmod/F-11/rt2860-kmod.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- rt2860-kmod.spec 7 May 2010 10:41:44 -0000 1.66
+++ rt2860-kmod.spec 8 May 2010 07:22:22 -0000 1.67
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: rt2860-kmod
Version: 2.3.0.0
14 years, 7 months
