jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 57210 from home:mseben:branches:Virtualization

Browse Source 
- fix rcvboxdrv setup - we disallow building of kernel modules from sources
- added rcvboxdrv, rcvboxadd files

OBS-URL: https://build.opensuse.org/request/show/57210
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=14
This commit is contained in:
Michal Seben 2011-01-05 22:13:56 +00:00 committed by Git OBS Bridge
parent e2515b05e3
commit a1a5847c08
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtualbox.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 31 22:41:25 UTC 2010 - mseben@gmail.com Fri Dec 31 22:41:25 UTC 2010 - mseben@gmail.com

31
virtualbox.spec
View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,7 +32,7 @@ BuildRequires: e2fsprogs-devel libcap-devel libcurl-devel python-devel update-d
BuildRequires: hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel xorg-x11-server xorg-x11-server-sdk 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 BuildRequires: LibVNCServer-devel gcc43-c++ kbuild pam-devel udev
#added for vbox 4.0.0 #added for vbox 4.0.0
BuildRequires: zlib-devel-static BuildRequires: zlib-devel-static
%ifarch amd64 x86_64 ia32e em64t %ifarch amd64 x86_64 ia32e em64t
BuildRequires: hal-32bit BuildRequires: hal-32bit
BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit
@ -117,6 +117,7 @@ Provides: %{name}-ose:/usr/lib/virtualbox/VirtualBox.so
Provides: %{name}-ose-qt = %version Provides: %{name}-ose-qt = %version
Obsoletes: %{name}-ose-qt < %version Obsoletes: %{name}-ose-qt < %version
%description qt %description qt
Qt GUI part for %{name}. Qt GUI part for %{name}.
######################################### #########################################
@ -169,7 +170,6 @@ VirtualBox guest addition tools.
########################################### ###########################################
%package -n python-%{name} %package -n python-%{name}
Summary: Python bindings for %{name} Summary: Python bindings for %{name}
Group: Development/Libraries/Python Group: Development/Libraries/Python
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -325,6 +325,8 @@ echo "entering guest-tools install section"
%{buildroot}/sbin/mount.vboxsf %{buildroot}/sbin/mount.vboxsf
%__install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh \ %__install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh \
%{buildroot}%{_sysconfdir}/init.d/vboxadd %{buildroot}%{_sysconfdir}/init.d/vboxadd
%__ln_s %{_sysconfdir}/init.d/vboxadd \
%{buildroot}%{_sbindir}/rcvboxadd
# udev rule for guest (virtualbox-guest-tools) # udev rule for guest (virtualbox-guest-tools)
%__install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxguest.rules %__install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
# #
@ -421,18 +423,20 @@ popd
%__install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules %__install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
# install config with session shutdown defs # install config with session shutdown defs
%__install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox %__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 %__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 \ %__install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in \
%{buildroot}%{_sysconfdir}/init.d/vboxdrv %{buildroot}%{_sysconfdir}/init.d/vboxdrv
#install wrapper script %__ln_s %{_sysconfdir}/init.d/vboxdrv \
%__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox %{buildroot}%{_sbindir}/rcvboxdrv
# Init script to start virtual boxes during boot # Init script to start virtual boxes during boot
%__install -m 755 %{S:12} %{buildroot}%{_sysconfdir}/init.d/vboxes %__install -m 755 %{S:12} %{buildroot}%{_sysconfdir}/init.d/vboxes
%__ln_s %{_sysconfdir}/init.d/vboxes %{buildroot}%{_sbindir}/rcvboxes %__ln_s %{_sysconfdir}/init.d/vboxes \
%__install -d -m 755 %buildroot%_var/adm/fillup-templates %{buildroot}%{_sbindir}/rcvboxes
install -m 700 %{S:13} %buildroot%_var/adm/fillup-templates/sysconfig.vbox %__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 %suse_update_desktop_file -i %{name} System Emulator
@ -548,6 +552,7 @@ exit 0
%{_sysconfdir}/init.d/vboxes %{_sysconfdir}/init.d/vboxes
%{_var}/adm/fillup-templates/sysconfig.vbox %{_var}/adm/fillup-templates/sysconfig.vbox
%{_sbindir}/rcvboxes %{_sbindir}/rcvboxes
%{_sbindir}/rcvboxdrv
#check setuid bit #check setuid bit
%if %suse_version > 1110 %if %suse_version > 1110
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl %verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
@ -601,8 +606,8 @@ exit 0
/sbin/mount.vboxsf /sbin/mount.vboxsf
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules %config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/init.d/vboxadd %config %{_sysconfdir}/init.d/vboxadd
%{_sbindir}/rcvboxadd
# #
%files -n python-%{name} %files -n python-%{name}
%defattr(-,root, root) %defattr(-,root, root)
%dir %{_vbox_instdir}/sdk %dir %{_vbox_instdir}/sdk