1
0
forked from pool/virtualbox

Accepting request 163206 from Virtualization

- add a _constraints file to avoid random failures on small workers (forwarded request 163195 from coolo)

OBS-URL: https://build.opensuse.org/request/show/163206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=66
This commit is contained in:
Stephan Kulow 2013-04-09 05:44:55 +00:00 committed by Git OBS Bridge
commit d129965b58
10 changed files with 145 additions and 61 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:906b954c9c952c6cf43f91ff5833449624d8c984dc0a37dab22e5be44f2030c6
size 48899142

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:204e2cdb9ef210a2de1890b80a41b8961610d3751c49020df4bd2d0afe45cf83
size 48907587

8
_constraints Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<constraints>
<hardware>
<memory>
<size unit="M">3800</size>
</memory>
</hardware>
</constraints>

View File

@ -0,0 +1,13 @@
Index: VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-4.2.10.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
@@ -650,7 +650,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts
: $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
- $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
+ $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
$(APPEND) $@ done
# copy the generated headers and stuff. This has to be a separate rule if we

20
vbox-gsoapssl-deps.diff Normal file
View File

@ -0,0 +1,20 @@
Index: VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- VirtualBox-4.2.10.orig/src/VBox/Main/webservice/Makefile.kmk
+++ VirtualBox-4.2.10/src/VBox/Main/webservice/Makefile.kmk
@@ -298,6 +298,7 @@ endif
vboxwebsrv_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
$(VBOX_GSOAP_CXX_LIBS) \
+ ssl crypto z \
$(LIB_RUNTIME)
vboxwebsrv_LIBS.solaris += socket nsl
ifdef VBOX_WITH_WEBSERVICES_SSL
@@ -443,6 +444,7 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) |
webtest_LIBS += \
$(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
$(VBOX_GSOAP_CXX_LIBS) \
+ ssl crypto z \
$(LIB_RUNTIME)
webtest_LIBS.solaris += nsl
ifdef VBOX_WITH_WEBSERVICES_SSL

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c810c90f5c25b7461ef6c97abfdcf92aefe360f2216d27d2ee114bbc3e789fe1
size 6130142

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e076aa9835e5de8b9ddf2ab72b945ed878d9f2d748610f6d32b90ff705226a9
size 6133610

View File

@ -1,5 +1,6 @@
KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
#these two lines give access permission to vboxusers to properly work with usb nodes, this could be security risk (bnc#664520) !!
#
#SUBSYSTEM=="usb_device",ATTR{devnum}=="?*",ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}",RUN+="/usr/bin/setfacl -m g:vboxusers:6 /dev/vboxusb/$attr{busnum}/$attr{devnum}"
#SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTR{devnum}=="?*",ATTR{busnum}=="?*",SYMLINK+="vboxusb/$attr{busnum}/$attr{devnum}",RUN+="/usr/bin/setfacl -m g:vboxusers:6 /dev/vboxusb/$attr{busnum}/$attr{devnum}"
#these lines below give access permission to vboxusers to properly work with usb nodes, but enabling them could be security risk (bnc#664520) !!
#SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
#SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
#SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
#SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"

View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Mon Apr 8 07:47:34 UTC 2013 - coolo@suse.com
- add a _constraints file to avoid random failures on small workers
-------------------------------------------------------------------
Sun Mar 31 06:49:28 UTC 2013 - mseben@gmail.com
- added vbox-deprec-gsoap-service-proxies.diff to fix deprecated old-style C++ service proxies (use soapcpp2 -z1 flag)
- added vbox-gsoapssl-deps.diff as workaround to fix build
-------------------------------------------------------------------
Fri Mar 29 14:07:28 UTC 2013 - mseben@gmail.com
- added VBoxCreateUSBNode.sh from vbox upstream for creating usb device nodes,
by default this feature is disabled so you have to enable it in vbox udev rules by hand (bnc#799741)
- updated to virtualbox 4.2.10
* GUI: fixed keyboard with XQuartz X server (bug #10664)
* Main/Display: fixed a crash with multi-monitors under certain conditions (Mac OS X hosts only)
* Main/Properties: fixed a crash under certain conditions, for example after wakeup from host hibernate (bug #11444)
* Settings: don't lose the internal network settings if they are not currently active
* Storage: another incompatibility fix for VHD differencing images with Hyper-V (bug #5990)
* VBoxManage: don't read beyond the end of the file specified with export --eulafile (bug #11528)
* Linux hosts / guests: Linux 3.9-rc0 compile fixes (bug #11529)
* Linux Additions: fixed two warnings in the shared folders guest kernel module (bug #11390)
* Linux Additions: don't crash VBoxService if libdbus is not available (bug #8638)
* Windows Additions: fixed upgrading MultiMedia Redirection (MMR) support
-------------------------------------------------------------------
Wed Mar 20 12:01:20 UTC 2013 - sndirsch@suse.com

View File

@ -19,6 +19,9 @@
%define _vbox_instdir /usr/lib/virtualbox
Name: virtualbox
%if %suse_version > 1230
BuildRequires: which
%endif
BuildRequires: acpica
BuildRequires: dmidecode
BuildRequires: fdupes
@ -82,7 +85,7 @@ BuildRequires: xorg-x11-libXt-devel-32bit
%endif
#
ExclusiveArch: %ix86 x86_64
Version: 4.2.8
Version: 4.2.10
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0+
@ -122,6 +125,10 @@ Patch4: vbox-ret-in-nonvoid-fnc.diff
Patch6: vbox-smc-napa.diff
#fix build of Python and dev package on openSUSE 11.3
Patch8: vbox-python-detection.diff
#deprecated old-style C++ service proxies and objects,we have to use soapcpp2 -z1 flag
Patch9: vbox-deprec-gsoap-service-proxies.diff
#fix failed linking process during build - this patch is just quick workaround
Patch10: vbox-gsoapssl-deps.diff
#PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
#try to start VirtualBox and is not memeber of vboxusers group
Patch99: vbox-permissions_warning.diff
@ -249,6 +256,8 @@ Development file for %{name}
%patch4 -p1
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch99 -p1
%patch100
%patch101
@ -387,17 +396,17 @@ done
echo "entering guest-tools install section"
###########################################
%__install -m 755 out/linux.*/release/bin/additions/VBoxControl \
%{buildroot}%{_bindir}/VBoxControl
%{buildroot}%{_bindir}/VBoxControl
%__install -m 755 out/linux.*/release/bin/additions/VBoxService \
%{buildroot}%{_bindir}/VBoxService
%{buildroot}%{_bindir}/VBoxService
%__install -m 755 out/linux.*/release/bin/additions/mount.vboxsf \
%{buildroot}/sbin/mount.vboxsf
%{buildroot}/sbin/mount.vboxsf
%__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
%{buildroot}%{_sbindir}/rcvboxadd
# 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
#
##############################################################
echo "entering guest-x11 install section"
@ -411,34 +420,34 @@ pushd out/linux.*/release/bin/additions/
%if %suse_version > 1220
%__install -m 755 vboxvideo_drv_113.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%if %suse_version == 1220
%__install -m 755 vboxvideo_drv_112.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%if %suse_version == 1210
%__install -m 755 vboxvideo_drv_110.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%if %suse_version == 1140
%__install -m 755 vboxvideo_drv_19.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%if %suse_version == 1130
%__install -m 755 vboxvideo_drv_18.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%if %suse_version == 1120
%__install -m 755 vboxmouse_drv_16.so \
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_16.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%else
%__install -m 755 vboxmouse_drv_15.so \
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
%__install -m 755 vboxvideo_drv_15.so \
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%endif #if =1120
%endif #if =1130
%endif #if =1140
@ -448,12 +457,12 @@ pushd out/linux.*/release/bin/additions/
popd
# VBoxOGL* libs for guest-x11 subpackage
%__install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
%{buildroot}%{_libdir}
%{buildroot}%{_libdir}
# make link for dri lib
%__ln_s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
%__ln_s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
%__install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient \
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
#%if %suse_version >= 1130
# add xorg config snipet to vbox mouse integration recognize
# %__install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/60-vboxmouse.conf
@ -461,7 +470,7 @@ popd
%if %suse_version < 1130
# hal policy file to autodetect the virtualbox mouse
%__install -m 644 src/VBox/Additions/linux/installer/90-vboxguest.fdi \
%{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%{buildroot}%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%endif
##############################################
@ -469,61 +478,63 @@ echo "entering virtualbox(-qt) install section"
##############################################
# copy the main files to %{_vbox_instdir}
pushd out/linux.*/release/bin
%__install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxManage %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxHeadless %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSDL %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxTunctl %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxTunctl %{buildroot}%{_vbox_instdir}
# create links to vbox tools in PATH - they could be usefull for controlling vbox from command line
%__ln_s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
%__ln_s %{_vbox_instdir}/VBoxManage %{buildroot}%{_bindir}/VBoxManage
%__ln_s %{_vbox_instdir}/VBoxHeadless \
%{buildroot}%{_bindir}/VBoxHeadless
%__ln_s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
%{buildroot}%{_bindir}/VBoxHeadless
%__ln_s %{_vbox_instdir}/VBoxSDL %{buildroot}%{_bindir}/VBoxSDL
%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
%__install -m 755 VBoxSVC %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxXPCOMIPCD %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxExtPackHelperApp %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxTestOGL %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxPermissionMessage \
%{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxBFE %{buildroot}%{_vbox_instdir}
%__install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
%{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetDHCP %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxNetAdpCtl %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxBFE %{buildroot}%{_vbox_instdir}
%__install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxEFI*.fd %{buildroot}%{_vbox_instdir}
%__install -m 755 VBoxSysInfo.sh %{buildroot}%{_vbox_instdir}
%__install -m 755 *.so %{buildroot}%{_vbox_instdir}
%__install -m 644 V*.gc %{buildroot}%{_vbox_instdir}
%__install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
%__install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/
%__install -m 644 components/* %{buildroot}%{_vbox_instdir}/components/
# install languages
%__install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/
%__install -m 644 nls/* %{buildroot}%{_datadir}/virtualbox/nls/
popd
# install desktop file
%__install -m 644 out/linux.*/release/bin/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop 'System Emulator'
%__install -m 644 out/linux.*/release/bin/virtualbox.desktop \
%{buildroot}%{_datadir}/applications/%{name}.desktop
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop 'System Emulator'
# create a menu entry
%__install -m 644 out/linux.*/release/bin/VBox.png \
%{buildroot}%{_datadir}/pixmaps/virtualbox.png
%{buildroot}%{_datadir}/pixmaps/virtualbox.png
# install udev rule for host (virtualbox)
%__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 -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox
%__install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox
#install wrapper script
%__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox
%__install -m 644 %{S:9} %{buildroot}%{_bindir}/VirtualBox
# modify and install the vboxdrv init script
# TODO: some of this stuff breaks the fillup macros below?
%__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 \
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
%{buildroot}%{_sysconfdir}/init.d/vboxdrv
%__ln_s %{_sysconfdir}/init.d/vboxdrv \
%{buildroot}%{_sbindir}/rcvboxdrv
%{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
%{buildroot}%{_sbindir}/rcvboxes
# sysconfig file intended for vboxes script
%__install -d -m 755 %{buildroot}%{_var}/adm/fillup-templates
install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vbox
@ -531,8 +542,10 @@ install -m 700 %{S:13} %{buildroot}%{_var}/adm/fillup-templates/sysconfig.vb
# config file for vboxdrv script and vboxweb
%__install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
echo -e "#settings for vboxwebsrn\nVBOXWEB_USER=root" > \
%{buildroot}%{_sysconfdir}/vbox/vbox.cfg
%{buildroot}%{_sysconfdir}/vbox/vbox.cfg
# install udev helper script for creating usb devices
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \
$RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh
######################################################
echo "entrering python-virtualbox install section"
######################################################
@ -734,6 +747,7 @@ exit 0
%{_var}/adm/fillup-templates/sysconfig.vbox
%{_sbindir}/rcvboxes
%{_sbindir}/rcvboxdrv
/lib/udev/VBoxCreateUSBNode.sh
%if %suse_version >= 1140
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
%else