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
Lubomir Rintel
lkundrak at rpmfusion.org
Mon May 10 12:21:44 CEST 2010
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 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-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 at 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 ---
More information about the rpmfusion-commits
mailing list