rpms/VirtualBox/devel VirtualBox-4.3.20-strings.patch, NONE, 1.1 VirtualBox-4.1.18-strings.patch, 1.2, 1.3 VirtualBox.spec, 1.69, 1.70
Sérgio M. Basto
sergiomb at rpmfusion.org
Fri Dec 26 06:06:31 CET 2014
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8194
Modified Files:
VirtualBox-4.1.18-strings.patch VirtualBox.spec
Added Files:
VirtualBox-4.3.20-strings.patch
Log Message:
* Fri Dec 26 2014 Sérgio Basto <sergio at serjux.com> - 4.3.20-3
- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
VirtualBox-4.3.20-strings.patch:
Frontends/VirtualBox/src/main.cpp | 24 +++++++++++++-----------
VMM/VMMR3/VM.cpp | 8 ++++----
2 files changed, 17 insertions(+), 15 deletions(-)
--- NEW FILE VirtualBox-4.3.20-strings.patch ---
* Fri Dec 26 2014 Sérgio Basto <sergio at serjux.com>
It is possible not have kmods is not always just not loaded kernel.
* Mon Jul 09 2012 Sérgio Basto <sergio at serjux.com>
rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
by: Naveed Hasan <naveed at cs.columbia.edu>
* Sat Jun 16 2012 Sérgio Basto <sergio at serjux.com>
Rebased for 4.1.16 (partial rfbz #1826)
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.orig 2014-12-26 03:15:24.511780506 +0000
+++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2014-12-26 03:35:54.819561727 +0000
@@ -74,13 +74,15 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
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. If it is available in your distribution, you 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."
+ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
+ " <font color=blue>'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox'</font><br/><br/>"
+ "On *not* stable versions of Fedora you need use akmods (because we don't have pre-built kmods) "
+ "or for custom kernels, you may do instead as root:"
+ " <font color=blue>'yum install akmod-VirtualBox kernel-devel-$(uname -r); akmods'</font>"
+ "If you installed VirtualBox packages and don't had reboot the system, you may need load the "
+ "kernel driver, doing as root:"
+ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -94,18 +97,18 @@ QString g_QStrHintLinuxWrongDriverVersio
"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>'rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart systemd-modules-load.service'</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPMFusion version and the Oracle version of VirtualBox."
);
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)
--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2014-12-26 03:15:24.513780527 +0000
+++ ./src/VBox/VMM/VMMR3/VM.cpp 2014-12-26 03:35:54.821561747 +0000
@@ -378,8 +378,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#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");
+ "Load the kernel module by executing "
+ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -420,8 +420,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#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. Install the kernel module by executing "
+ "'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
VirtualBox-4.1.18-strings.patch:
Frontends/VirtualBox/src/main.cpp | 25 ++++++++++++++-----------
Installer/linux/VBox.sh | 13 ++++++++-----
VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 26 insertions(+), 20 deletions(-)
Index: VirtualBox-4.1.18-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.1.18-strings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.1.18-strings.patch 29 Jun 2013 04:58:46 -0000 1.2
+++ VirtualBox-4.1.18-strings.patch 26 Dec 2014 05:06:30 -0000 1.3
@@ -21,7 +21,7 @@
diff -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-20 14:16:20.000000000 +0100
+++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-07-09 04:57:00.690645723 +0100
-@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
+@@ -72,13 +72,16 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
@@ -32,12 +32,15 @@
- "as root. If it is available in your distribution, you 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 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/>"
++ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded."
++ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
++ " <font color=blue>'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox'</font><br/><br/>"
++ "On *not* stable versions of Fedora you need use akmods (because we don't have pre-built kmods) "
++ "or for custom kernels, you may do instead as root:"
++ " <font color=blue>'yum install akmod-VirtualBox kernel-devel-$(uname -r)'</font>"
++ " <font color=blue>'akmods'</font><br/><br/>"
++ "If you installed VirtualBox packages and don't had reboot the system, you may need load the "
++ "kernel driver, doing as root:"
+ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
@@ -47,7 +50,7 @@
"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>'systemctl restart systemd-modules-load.service '</font> as root<br/><br/>"
++ " <font color=blue>'systemctl restart systemd-modules-load.service'</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPM Fusion version and the Oracle version of VirtualBox."
@@ -105,7 +108,7 @@
"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 load the kernel module by executing "
++ "Load the kernel module by executing "
+ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
@@ -116,8 +119,8 @@
"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. Load the kernel module by executing "
-+ "'systemctl restart systemd-modules-load.service' as root");
++ "reason. Install the kernel module by executing "
++ "'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- VirtualBox.spec 21 Dec 2014 19:19:11 -0000 1.69
+++ VirtualBox.spec 26 Dec 2014 05:06:30 -0000 1.70
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.3.20
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -42,7 +42,7 @@
Source10: vboxweb.service
Source11: vboxservice.service
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
-Patch2: VirtualBox-4.1.18-strings.patch
+Patch2: VirtualBox-4.3.20-strings.patch
Patch3: VirtualBox-4.3.0-libcxx.patch
Patch4: VirtualBox-4.3.0-testmangle.patch
Patch10: VirtualBox-4.3.0-32bit.patch
@@ -178,10 +178,13 @@
%description guest
-This is the same that Guest Additions, therefore should only be installed on a guest system.
-Tools that utilize kernel modules for supporting integration
-with the Host, including file sharing and tracking of mouse pointer
-movement and X.org X11 video and mouse driver.
+Important note: VirtualBox-guest can't be installed on Host (master) system because
+contains X11 and OpenGL drives that will mess up with your X11 configurations.
+This subpackage replace Oracle Linux Guest Addition but just for Fedora,
+therefore should be installed only when we have one Fedora as a guest system.
+Tools that use kernel modules for supporting integration
+with the Host, including file sharing, clipboard sharing,
+X.org X11 video and mouse driver, USB and webcam proxy and Seamless mode.
%package kmodsrc
@@ -616,6 +619,10 @@
%changelog
+* Fri Dec 26 2014 Sérgio Basto <sergio at serjux.com> - 4.3.20-3
+- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
+- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
+
* Sun Dec 21 2014 Sérgio Basto <sergio at serjux.com> - 4.3.20-2
- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
More information about the rpmfusion-commits
mailing list