Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package virtualbox for openSUSE:Factory
checked in at Wed Jan 12 10:44:29 CET 2011.



--------
--- virtualbox/virtualbox.changes       2011-01-01 16:40:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtualbox/virtualbox.changes  2011-01-10 
15:49:07.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Jan  5 08:16:35 UTC 2011 - mseben@xxxxxxxxx
+
+- fix rcvboxdrv setup - we disallow building of kernel modules from sources
+- added rcvboxdrv, rcvboxadd files
+- fix build fail: "Out of memory: Kill process" : use "-j1" for kmk to disable 
parallel build
+- fix build for older distros
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.9Os2mu/_old  2011-01-12 10:42:24.000000000 +0100
+++ /var/tmp/diff_new_pack.9Os2mu/_new  2011-01-12 10:42:24.000000000 +0100
@@ -31,8 +31,9 @@
 BuildRequires:  e2fsprogs-devel libcap-devel libcurl-devel python-devel 
update-desktop-files
 BuildRequires:  hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel 
xorg-x11-server xorg-x11-server-sdk
 BuildRequires:  LibVNCServer-devel gcc43-c++ kbuild pam-devel udev
-#added for vbox 4.0.0
+%if %suse_version > 1110  
 BuildRequires:  zlib-devel-static
+%endif
 %ifarch amd64 x86_64 ia32e em64t
 BuildRequires:  hal-32bit
 BuildRequires:  xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit 
xorg-x11-libs-32bit
@@ -42,7 +43,7 @@
 #
 ExclusiveArch:  %ix86 x86_64
 Version:        4.0.0
-Release:        1
+Release:        2
 Summary:        VirtualBox is an Emulator
 License:        GPLv2+
 Group:          System/Emulators/PC
@@ -227,7 +228,9 @@
 #
 #      VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop 
file 
 #      VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable 
some functionality in gui 
+#       -j1 disable parallel build to avoid "Out of memory: Kill process" 
crash of build in buildservice
 /usr/bin/kmk \
+        -j1 \
        KBUILD_VERBOSE=2 \
        VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
        TOOL_YASM_AS=yasm \
@@ -325,6 +328,8 @@
                                                                        
%{buildroot}/sbin/mount.vboxsf
 %__install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh \
                                                                        
%{buildroot}%{_sysconfdir}/init.d/vboxadd
+%__ln_s %{_sysconfdir}/init.d/vboxadd \
+                                                                       
%{buildroot}%{_sbindir}/rcvboxadd
 # udev rule for guest (virtualbox-guest-tools)
 %__install -m 644 %{SOURCE3}           
%{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
 #
@@ -421,18 +426,20 @@
 %__install -m 644 %{SOURCE2}           
%{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
 # install config with session shutdown defs
 %__install -m 644 %{SOURCE4}           
%{buildroot}%{_sysconfdir}/default/virtualbox
-# copy the init scripts
+#install wrapper script
+%__install -m 644 %{S:9}                       
%{buildroot}%{_bindir}/VirtualBox
+# modify and install the vboxdrv init script
 %__sed -i "s|%NOLSB%|yes|g;s|%DEBIAN%||g;s|%PACKAGE%|virtualbox|g" 
src/VBox/Installer/linux/vboxdrv.sh.in
 %__install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in \
                                                                        
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
-#install wrapper script
-%__install -m 644 %{S:9}                       
%{buildroot}%{_bindir}/VirtualBox
-
+%__ln_s %{_sysconfdir}/init.d/vboxdrv \
+                                                                       
%{buildroot}%{_sbindir}/rcvboxdrv
 # Init script to start virtual boxes during boot
 %__install -m 755 %{S:12} %{buildroot}%{_sysconfdir}/init.d/vboxes
-%__ln_s %{_sysconfdir}/init.d/vboxes %{buildroot}%{_sbindir}/rcvboxes
-%__install -d -m 755 %buildroot%_var/adm/fillup-templates
-install -m 700 %{S:13} %buildroot%_var/adm/fillup-templates/sysconfig.vbox
+%__ln_s %{_sysconfdir}/init.d/vboxes \
+                                                                       
%{buildroot}%{_sbindir}/rcvboxes
+%__install -d -m 755                           
%{buildroot}%{_var}/adm/fillup-templates
+install -m 700 %{S:13}                                 
%{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
 
 %suse_update_desktop_file -i %{name} System Emulator
 
@@ -548,6 +555,7 @@
 %{_sysconfdir}/init.d/vboxes
 %{_var}/adm/fillup-templates/sysconfig.vbox
 %{_sbindir}/rcvboxes
+%{_sbindir}/rcvboxdrv
 #check setuid bit
 %if %suse_version > 1110
 %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
@@ -601,6 +609,7 @@
 /sbin/mount.vboxsf
 %config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
 %config %{_sysconfdir}/init.d/vboxadd
+%{_sbindir}/rcvboxadd
 #
 
 %files -n python-%{name}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx