rpms/VirtualBox/F-19 .cvsignore, 1.45, 1.46 VirtualBox-4.1.18-strings.patch, 1.1, 1.2 VirtualBox-guest.modules, 1.1, 1.2 VirtualBox.modules, 1.1, 1.2 VirtualBox.spec, 1.43, 1.44 sources, 1.45, 1.46
Sérgio M. Basto
sergiomb at rpmfusion.org
Sat Jun 29 15:00:15 CEST 2013
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9149
Modified Files:
.cvsignore VirtualBox-4.1.18-strings.patch
VirtualBox-guest.modules VirtualBox.modules VirtualBox.spec
sources
Log Message:
* Sat Jun 29 2013 Sérgio Basto <sergio at serjux.com> - 4.2.14-1
- Change strings instructions to load modules.
- New upstream release.
- Drop gcc-4.8 patch.
* Sun May 12 2013 Sérgio Basto <sergio at serjux.com> - 4.2.12-2
- drop some Buildrequires as documented in https://www.virtualbox.org/wiki/Linux%20build%20instructions
- Use systemd-modules-load.service instead fedora-loadmodules.service ( Load legacy module
configuration ).
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 15 Apr 2013 17:27:35 -0000 1.45
+++ .cvsignore 29 Jun 2013 13:00:15 -0000 1.46
@@ -1 +1 @@
-VirtualBox-4.2.12.tar.bz2
+VirtualBox-4.2.14.tar.bz2
VirtualBox-4.1.18-strings.patch:
Frontends/VirtualBox/src/main.cpp | 22 +++++++++++-----------
Installer/linux/VBox.sh | 13 ++++++++-----
VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 23 insertions(+), 20 deletions(-)
Index: VirtualBox-4.1.18-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox-4.1.18-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.1.18-strings.patch 1 Sep 2012 20:00:36 -0000 1.1
+++ VirtualBox-4.1.18-strings.patch 29 Jun 2013 13:00:15 -0000 1.2
@@ -1,9 +1,9 @@
* Mon Jul 09 2012 Sérgio Basto <sergio at serjux.com>
-- rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
+ 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)
+ Rebased for 4.1.16 (partial rfbz #1826)
From: Lubomir Rintel <lkundrak at v3.sk>
@@ -38,7 +38,7 @@
+ "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.modules'</font><br/><br/>"
++ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -47,7 +47,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>'/etc/sysconfig/modules/VirtualBox.modules'</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."
@@ -73,10 +73,10 @@
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 load the kernel module by executing
++ load. Please make sure that you have kmod-VirtualBox for current kernel and load the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
-+ '/etc/sysconfig/modules/VirtualBox.modules' (as root)
++ 'systemctl restart systemd-modules-load.service' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
@@ -87,8 +87,8 @@
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevadm control --reload-rules' (as root)
-+ 'systemctl restart udev-trigger.service' (as root)
-+ 'systemctl restart udev-settle.service' (as root)
++ '/sbin/udevadm trigger --subsystem-match=usb --action=add' (as root)
++ '/sbin/udevadm settle' (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
@@ -106,7 +106,7 @@
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer or load the kernel module by executing "
-+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
++ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -117,7 +117,7 @@
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Load the kernel module by executing "
-+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
++ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
Index: VirtualBox-guest.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox-guest.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-guest.modules 1 Sep 2012 20:00:39 -0000 1.1
+++ VirtualBox-guest.modules 29 Jun 2013 13:00:15 -0000 1.2
@@ -1,12 +1,3 @@
-#!/bin/sh
-
-# 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 "insmod "$2}' |$SHELL
-}
-
-insert_module vboxguest
-insert_module vboxsf
-
+vboxguest
+vboxsf
+vboxvideo
Index: VirtualBox.modules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.modules,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox.modules 3 Sep 2012 01:28:08 -0000 1.1
+++ VirtualBox.modules 29 Jun 2013 13:00:15 -0000 1.2
@@ -1,17 +1,3 @@
-#!/bin/sh
-
-# User is advised to run this on upgrades
-/sbin/modprobe -r -b vboxnetflt &>/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 "insmod "$2}' |$SHELL
-}
-
-insert_module vboxdrv
-insert_module vboxnetflt
-insert_module vboxnetadp
+vboxdrv
+vboxnetflt
+vboxnetadp
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- VirtualBox.spec 15 Apr 2013 17:27:35 -0000 1.43
+++ VirtualBox.spec 29 Jun 2013 13:00:15 -0000 1.44
@@ -26,7 +26,7 @@
#endif
Name: VirtualBox
-Version: 4.2.12
+Version: 4.2.14
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -54,7 +54,6 @@
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
Patch26: VirtualBox-4.2.4-no-bundles.patch
-Patch27: VirtualBox-4.2.6-gcc48.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -62,7 +61,7 @@
BuildRequires: SDL-devel xalan-c-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel
+BuildRequires: iasl libxslt-devel xerces-c-devel libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: python-devel
@@ -70,7 +69,6 @@
BuildRequires: libcap-devel
BuildRequires: qt4-devel
BuildRequires: gsoap-devel
-BuildRequires: xz
BuildRequires: pam-devel
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
@@ -234,17 +232,10 @@
%patch25 -p1 -b .xorg111
%endif
%patch26 -p1 -b .nobundles
-%patch27 -p1 -b .gcc48
# CRLF->LF
sed -i 's/\r//' COPYING
-# Testings
-#for S in doc/manual/fr_FR/*xml
-#do
-# sed -i 's/[&][a-zA-Z0-9]\{2,5\}[;]/ /g' $S
-#done
-
%build
./configure --disable-kmods \
%if %{enable_webservice}
@@ -424,13 +415,14 @@
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#ancient script /usr/bin/VBoxClient-all does not exits
+#install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
+# $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
install -m 0644 -D %{SOURCE8} \
$RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
@@ -450,8 +442,8 @@
install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
# 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 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.modules
+install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.modules
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -486,7 +478,7 @@
fi
# should be in kmod package, not here
-/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
+/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ] ; then
@@ -516,7 +508,7 @@
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
# should be in kmod package, not here
-/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
+/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
@@ -578,7 +570,7 @@
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
-%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
+%config %{_sysconfdir}/modules-load.d/%{name}.modules
%doc COPYING*
%doc doc/*.*
%if %{enable_docs}
@@ -610,10 +602,10 @@
%{_libdir}/VBoxOGL*.so
#{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+#%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
-%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
+%config %{_sysconfdir}/modules-load.d/%{name}-guest.modules
%doc COPYING
%{_unitdir}/vboxservice.service
@@ -623,6 +615,16 @@
%changelog
+* Sat Jun 29 2013 Sérgio Basto <sergio at serjux.com> - 4.2.14-1
+- Change strings instructions to load modules.
+- New upstream release.
+- Drop gcc-4.8 patch.
+
+* Sun May 12 2013 Sérgio Basto <sergio at serjux.com> - 4.2.12-2
+- drop some Buildrequires as documented in https://www.virtualbox.org/wiki/Linux%20build%20instructions
+- Use systemd-modules-load.service instead fedora-loadmodules.service ( Load legacy module
+ configuration ).
+
* Mon Apr 15 2013 Sérgio Basto <sergio at serjux.com> - 4.2.12-1
- New upstream release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 15 Apr 2013 17:27:35 -0000 1.45
+++ sources 29 Jun 2013 13:00:15 -0000 1.46
@@ -1 +1 @@
-654e45054ae6589452508d37403dc800 VirtualBox-4.2.12.tar.bz2
+be834de415adaf2f696f7a499f88b4e6 VirtualBox-4.2.14.tar.bz2
More information about the rpmfusion-commits
mailing list