Mailinglist Archive: opensuse-commit (1248 mails)
| < Previous | Next > |
commit virtualbox-ose for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 16 Apr 2010 01:47:54 +0200
- Message-id: <20100415234754.3D91D2029A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package virtualbox-ose for openSUSE:Factory
checked in at Fri Apr 16 01:47:54 CEST 2010.
--------
--- virtualbox-ose/virtualbox-ose.changes 2010-04-09 15:13:25.000000000
+0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes
2010-04-15 14:17:30.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 14 09:32:41 UTC 2010 - mseben@xxxxxxxxxx
+
+- added vbox-system-xorg.patch to build the X.Org server
+ additions against our system
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
VirtualBox-3.1.6-OSE.tar.bz2
sysconfig.vbox
vboxes
New:
----
vbox-system-xorg.patch
virtualbox-ose-sysconfig.vbox
virtualbox-ose-vboxes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox-ose.spec ++++++
--- /var/tmp/diff_new_pack.lToOi3/_old 2010-04-16 01:46:18.000000000 +0200
+++ /var/tmp/diff_new_pack.lToOi3/_new 2010-04-16 01:46:18.000000000 +0200
@@ -29,7 +29,7 @@
BuildRequires: bin86 dev86 libidl-devel libqt4-devel libxslt-devel yasm
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
+BuildRequires: hal-devel pulseaudio-devel xorg-x11 xorg-x11-devel
xorg-x11-server xorg-x11-server-sdk
BuildRequires: gcc43-c++ kbuild udev
%ifarch amd64 x86_64 ia32e em64t
BuildRequires: gcc-32bit hal-32bit
@@ -40,7 +40,7 @@
#
ExclusiveArch: %ix86 x86_64
Version: 3.1.6
-Release: 4
+Release: 5
Summary: VirtualBox OSE is an Emulator
License: GPLv2+
Group: System/Emulators/PC
@@ -62,8 +62,9 @@
Source9: %{name}-wrapper.sh
# since 11.3 we need this conf instead of HAL's fdi to define vbox mouse
Source10: %{name}-60-vboxmouse.conf
-Source12: vboxes
-Source13: sysconfig.vbox
+# init script to start virtual boxes during boot, to be configured via
/etc/sysconfig/vbox bnc#582398
+Source12: %{name}-vboxes
+Source13: %{name}-sysconfig.vbox
Source98: %{name}-%{version}-rpmlintrc
Source99: %{name}-patch-source.sh
#rework init script
@@ -77,6 +78,9 @@
#where vbox's hypervsor is currently mapped, then we'll create a #PF storm in
the guest.
#patch grabbed from svn : http://www.virtualbox.org/changeset/28090
Patch5: vbox-fix_PF_storm.diff
+#build xorg additions against system libs and headers, this patch could be
dropped in next release
+#but we have to switch to vbox{mouse,video}_drv_18.so
+Patch6: vbox-system-xorg.patch
#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
@@ -156,6 +160,7 @@
%patch3 -p1
%patch4 -p1
%patch5
+%patch6
%patch99 -p1
#copy user manual
cp %{S:1} ./UserManual.pdf
@@ -350,7 +355,7 @@
%__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
+install -m 700 %{S:13} %buildroot%_var/adm/fillup-templates/sysconfig.vbox
%suse_update_desktop_file -i %{name} System Emulator
++++++ vbox-system-xorg.patch ++++++
diff -upr
../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/common/crOpenGL/Makefile.kmk
./src/VBox/Additions/common/crOpenGL/Makefile.kmk
---
../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/common/crOpenGL/Makefile.kmk
2010-02-15 18:23:59.152073623 +0000
+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2010-02-15
18:58:58.872166263 +0000
@@ -67,16 +67,11 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET),linux solaris)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/1.3/xorg \
+ /usr/include/X11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
diff -upr
../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxmouse/Makefile.kmk
./src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxmouse/Makefile.kmk
2010-02-15 18:23:49.040084177 +0000
+++ ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2010-02-15
19:06:13.736122566 +0000
@@ -174,13 +174,9 @@ vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3X
vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxmouse_drv_17_INCS := \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \
+ /usr/include/X11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(PATH_SUB_CURRENT)
vboxmouse_drv_17_SOURCES = \
vboxmouse_15.c
diff -upr
../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxvideo/Makefile.kmk
./src/VBox/Additions/x11/vboxvideo/Makefile.kmk
--- ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxvideo/Makefile.kmk
2010-02-15 18:23:49.044072887 +0000
+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2010-02-15
18:50:16.512421990 +0000
@@ -247,19 +247,11 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_d
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15
+ /usr/include/X11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
+ /usr/include/X11/dri \
+ /usr/include/drm
vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
++++++ virtualbox-ose-sysconfig.vbox ++++++
## Path: System/Virtual Machines/VBox
## Description: Virtual box machines to autostart during boot
## Type: string
## Default: ""
#
# Configuration file for the script /etc/init.d/vboxes
#
# The variable VBOX_AUTOSTART holds the virtual machines to be started during
# boot time. One entry must contain the virtual machine name and the
# VBOX_USER_HOME directory. They are separated with a ";". Multiple entries
# (virtual machines) are separated with a space. The VBOX_USER_HOME is often
# the directory $HOME/.VirtualBox. It must be specified as the virtual machine
# can be maintained by a regular user, but root is starting the virtual machine.
#
# Examples:
# MachineName1;VBOX_USER_HOME
#
# One virtual machine:
# openSUSE_Factory;/home/openSUSE/.VirtualBox
#
# Multiple virtual machines:
# openSUSE_Factory;/home/openSUSE/.VirtualBox
openSUSE_stable;/home/openSUSE/.VirtualBox
#
VBOX_AUTOSTART=""
++++++ virtualbox-ose-vboxes ++++++
#!/bin/sh
#
# chkconfig: - 91 35
# description: Starts and stops vbox autostart VMs.
# Based on
# http://www.amiryan.org/2009/11/04/virtualbox-init-d-service-autostart-scriptu
#
# openSUSEfied by Richard Bos <rbos at opensuse dot org> - 2010
# http://www.linuxjournal.com/content/start-and-control-konsole-dbus
### BEGIN INIT INFO
# Provides: vboxes
# Required-Start: $network vboxdrv $ALL
# Required-Stop: $network $named
# Default-Start: 3 5
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Autostart Virtual Box VMs
# Description: Autostart Virtual Box VMs that are mentioned in
/etc/sysconfig/vbox file
### END INIT INFO
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
# rc_status -v be verbose in local rc status and clear it afterwards
# rc_status -v -r ditto and clear both the local and overall rc status
# rc_status -s display "skipped" and exit with status 3
# rc_status -u display "unused" and exit with status 3
# rc_failed set local and overall rc status to failed
# rc_failed <num> set local and overall rc status to <num>
# rc_reset clear both the local and overall rc status
# rc_exit exit appropriate to overall rc status
# rc_active checks whether a service is activated by symlinks
. /etc/rc.status
# Reset status of this service
rc_reset
# Return values acc. to LSB for all commands but status:
# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
# 4 - user had insufficient privileges
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
# considered a success.
VBOXMGR_BIN=/usr/bin/VBoxManage
if [[ ! -x $VBOXMGR_BIN ]]; then
echo "$VBOXMGR_BIN does not exist"
if [ "$1" = "stop" ]; then
exit 0;
else
exit 6
fi;
fi
PRG=$(basename $0)
SERVICE="Virtualbox machines"
[ -r /etc/sysconfig/vbox ] && . /etc/sysconfig/vbox
start()
{
N=1
for VBOX in $VBOX_AUTOSTART; do
if grep -q \; <<< "$VBOX"; then
VBOX_NAME[$N]=$(cut -d\; -f1 <<< "$VBOX")
VBOX_HOME[$N]=$(cut -d\; -f2 <<< "$VBOX")
else
VBOX_NAME[$N]="$VBOX"
VBOX_HOME[$N]=""
fi
N=$(($N+1))
done
VBOXES=${#VBOX_NAME[*]}
if [ $VBOXES -eq 0 ]; then
# The virtual machines have to be configured in /etc/sysconfig/vbox
echo -n "Starting $SERVICE: no virtual machines configured"
rc_status -u
else
N=1
echo -n "Starting $SERVICE: "
while [[ $N -le $VBOXES ]]; do
if [[ $N -lt $VBOXES ]]; then
echo -n "${VBOX_NAME[$N]}, "
else
echo ${VBOX_NAME[$N]}
fi
N=$(($N+1))
done
N=1
while [[ $N -le $VBOXES ]]; do
VBOX_RUNNING=$(VBoxManage list --long runningvms |
sed -n 's/^Name: *//p' | grep "${VBOX_NAME[$N]}")
if [[ -z "$VBOX_RUNNING" ]]; then
if [[ -n "${VBOX_HOME[$N]}" ]]; then
if [[ -d "${VBOX_HOME[$N]}/Machines" ]]; then
VBOX_PRESENT=$($VBOXMGR_BIN list --long vms | sed -n 's/Name: *//p'
|
grep -w "${VBOX_NAME[$N]}")
if [[ -n "$VBOX_PRESENT" ]]; then
$VBOXMGR_BIN -q startvm "${VBOX_NAME[$N]}" -type headless >
/tmp/$PRG.$$ 2>&1
RETVAL=$?
if [[ $RETVAL == 0 ]]; then
echo -n " Starting virtual machine ${VBOX_NAME[$N]}"
rc_status -v -r
else
echo -n " ${VBOX_NAME[$N]}: failed with the following output: "
rc_failed; rc_status -v -r
cat /tmp/$PRG.$$
fi
rm /tmp/$PRG.$$
else
echo -n " ${VBOX_NAME[$N]}: virtual machine not found"
rc_status -s -r
fi
else
echo -n " ${VBOX_NAME[$N]}: VBOX_USER_HOME (${VBOX_HOME[$N]}) not
found"
rc_status -s -r
fi
else
echo -n " ${VBOX_NAME[$N]}: no VBOX_USER_HOME configured"
rc_status -s -r
fi
else
echo -n " ${VBOX_NAME[$N]}: already running"
rc_status -v -r
fi
N=$(($N+1))
done
fi
}
stop()
{
N=1
VBOX_RUNNING=$($VBOXMGR_BIN list --long runningvms | sed -n 's/^Name: *//p')
for VBOX in $VBOX_RUNNING; do
VBOX_NAME[$N]="$VBOX"
N=$(($N+1))
done
VBOXES=${#VBOX_NAME[*]}
if [[ $VBOXES -eq 0 ]]; then
echo -n "Shutting down $SERVICE: no virtual machines running."
rc_status -s -r
else
echo -n "Shutting down $SERVICE: "
N=1
while [[ $N -le $VBOXES ]]; do
if [[ $N -lt $VBOXES ]]; then
echo -n "${VBOX_NAME[$N]}, "
else
echo "${VBOX_NAME[$N]}"
fi
N=$(($N+1))
done
N=1
while [[ $N -le $VBOXES ]]; do
echo -n " ${VBOX_NAME[$N]}: "
$VBOXMGR_BIN -q controlvm "${VBOX_NAME[$N]}" savestate
RETVAL=$?
echo -n " Shutting down virtual machine ${VBOX_NAME[$N]}"
if [[ $RETVAL == $? ]]; then
rc_status -v -r
else
rc_failed; rc_status -v -r
fi
N=$(($N+1))
done
fi
}
status()
{
N=1
VBOX_RUNNING=$($VBOXMGR_BIN list --long runningvms | sed -n 's/^Name: *//p')
for VBOX in $VBOX_RUNNING; do
VBOX_NAME[$N]="$VBOX"
N=$(($N+1))
done
VBOXES=${#VBOX_NAME[*]}
if [[ $VBOXES -eq 0 ]]; then
echo -n "Shutting down $SERVICE: no virtual machines running."
rc_status -s -r
else
N=1
while [[ $N -le $VBOXES ]]; do
STATE=$($VBOXMGR_BIN showvminfo "${VBOX_NAME[$N]}" | sed -n 's/State:
*//p')
printf "%-40s %s" "${VBOX_NAME[$N]}" "$STATE"
rc_status -v
N=$(($N+1))
done
fi
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart|force-reload)
stop
start
;;
status)
status
;;
*)
echo "Usage: $PRG {start|stop|restart|force-reload|status}" >&2
exit 3
;;
esac
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |