diff --git a/virtualbox.changes b/virtualbox.changes index b76ff35..f45de37 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 5 08:16:35 UTC 2011 - mseben@gmail.com + +- 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 + ------------------------------------------------------------------- Fri Dec 31 22:41:25 UTC 2010 - mseben@gmail.com diff --git a/virtualbox.spec b/virtualbox.spec index 3955418..97a9893 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,7 +1,7 @@ # -# spec file for package virtualbox (Version 4.0.0) +# spec file for package virtualbox (Version 3.9.80) # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,8 +31,9 @@ BuildRequires: SDL-devel kernel-syms module-init-tools 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 -BuildRequires: zlib-devel-static +%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 @@ -117,6 +118,7 @@ Provides: %{name}-ose:/usr/lib/virtualbox/VirtualBox.so Provides: %{name}-ose-qt = %version Obsoletes: %{name}-ose-qt < %version + %description qt Qt GUI part for %{name}. ######################################### @@ -169,7 +171,6 @@ VirtualBox guest addition tools. ########################################### %package -n python-%{name} - Summary: Python bindings for %{name} Group: Development/Libraries/Python Requires: %{name} = %{version} @@ -227,7 +228,9 @@ echo VBOX_WITH_VNC=1 >> Config.kmk # # 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 @@ echo "entering guest-tools install section" %{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 @@ popd %__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 +%__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 %suse_update_desktop_file -i %{name} System Emulator @@ -548,6 +555,7 @@ exit 0 %{_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,8 +609,8 @@ exit 0 /sbin/mount.vboxsf %config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules %config %{_sysconfdir}/init.d/vboxadd +%{_sbindir}/rcvboxadd # - %files -n python-%{name} %defattr(-,root, root) %dir %{_vbox_instdir}/sdk