/[gentoo-x86]/eclass/virtualx.eclass
Gentoo

Diff of /eclass/virtualx.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.19 Revision 1.27
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2004 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.19 2004/11/04 10:53:14 ferringb Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.27 2007/10/28 12:05:34 eva Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass can be used for packages that needs a working X environment to build 7# This eclass can be used for packages that needs a working X environment to build
8 8
9ECLASS=virtualx 9DEPEND="X? ( x11-base/xorg-server x11-apps/xhost )"
10INHERITED="$INHERITED $ECLASS" 10IUSE="X"
11DEPEND="virtual/x11"
12 11
13DESCRIPTION="Based on the $ECLASS eclass" 12DESCRIPTION="Based on the $ECLASS eclass"
14 13
15# 14#
16# Brian Harring <ferringb@gentoo.org> 11/04/2004 15# Brian Harring <ferringb@gentoo.org> 11/04/2004
17# do not disable the sandbox during the depend phase. 16# do not disable the sandbox during the depend phase.
18# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox. 17# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox.
19# 18#
20if [ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]; then 19if [[ ${EBUILD_PHASE/depend} == "${EBUILD_PHASE}" ]] ; then
21 [ -z "${SANDBOX_DISABLED}" ] && export SANDBOX_DISABLED="0" || : 20 [[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || :
22fi 21fi
23 22
24virtualmake() { 23virtualmake() {
25 local retval=0 24 local retval=0
26 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 25 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
26 local XVFB=$(type -p Xvfb)
27 local XHOST=$(type -p xhost)
27 28
28 #If $DISPLAY is not set, or xhost cannot connect to an X 29 # If $DISPLAY is not set, or xhost cannot connect to an X
29 #display, then do the Xvfb hack. 30 # display, then do the Xvfb hack.
30 if [ -z "$DISPLAY" ] || ! (/usr/X11R6/bin/xhost &>/dev/null) 31 if [[ -n ${XVFB} && -n ${XHOST} ]] && \
31 then 32 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
32 export XAUTHORITY= 33 export XAUTHORITY=
33 # The following is derived from Mandrake's hack to allow 34 # The following is derived from Mandrake's hack to allow
34 # compiling without the X display 35 # compiling without the X display
35 36
36 einfo "Scanning for a open DISPLAY to start Xvfb ..." 37 einfo "Scanning for an open DISPLAY to start Xvfb ..."
37 38
38 # We really do not want SANDBOX enabled here 39 # We really do not want SANDBOX enabled here
39 export SANDBOX_DISABLED="1" 40 export SANDBOX_DISABLED="1"
40 41
41 local i=0 42 local i=0
42 XDISPLAY=$(i=0; while [ -f /tmp/.X${i}-lock ] ; do i=$((${i}+1));done; echo ${i}) 43 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do i=$((${i}+1));done; echo ${i})
43 44
44 # If we are in a chrooted environment, and there is already a 45 # If we are in a chrooted environment, and there is already a
45 # X server started outside of the chroot, Xvfb will fail to start 46 # X server started outside of the chroot, Xvfb will fail to start
46 # on the same display (most cases this is :0 ), so make sure 47 # on the same display (most cases this is :0 ), so make sure
47 # Xvfb is started, else bump the display number 48 # Xvfb is started, else bump the display number
48 # 49 #
52 # support has been dropped in Xvfb in the xorg-x11 pre-releases. 53 # support has been dropped in Xvfb in the xorg-x11 pre-releases.
53 # For now only depths up to 24-bit are supported. 54 # For now only depths up to 24-bit are supported.
54 # 55 #
55 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004 56 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
56 # 57 #
57 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 58 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
58 sleep 2 59 sleep 2
59 60
60 local start=${XDISPLAY} 61 local start=${XDISPLAY}
61 while [ ! -f /tmp/.X${XDISPLAY}-lock ] 62 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
62 do
63 # Stop trying after 15 tries 63 # Stop trying after 15 tries
64 if [ $((${XDISPLAY} - ${start})) -gt 15 ]; then 64 if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then
65 65
66 eerror "" 66 eerror ""
67 eerror "Unable to start Xvfb." 67 eerror "Unable to start Xvfb."
68 eerror "" 68 eerror ""
69 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:" 69 eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
70 eerror "" 70 eerror ""
71 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 71 ${XVFB} :${XDISPLAY} -screen 0 800x600x24
72 eerror "" 72 eerror ""
73 eerror "If possible, correct the above error and try your emerge again." 73 eerror "If possible, correct the above error and try your emerge again."
74 eerror "" 74 eerror ""
75 die 75 die
76 fi 76 fi
77 77
78 XDISPLAY=$((${XDISPLAY}+1)) 78 XDISPLAY=$((${XDISPLAY}+1))
79 /usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24 &>/dev/null & 79 ${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
80 sleep 2 80 sleep 2
81 done 81 done
82 82
83 # Now enable SANDBOX again if needed. 83 # Now enable SANDBOX again if needed.
84 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 84 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
85 85
86 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 86 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
87 87
88 export DISPLAY=:${XDISPLAY} 88 export DISPLAY=:${XDISPLAY}
89 #Do not break on error, but setup $retval, as we need 89 #Do not break on error, but setup $retval, as we need
90 #to kill Xvfb 90 #to kill Xvfb
91 ${maketype} $* 91 ${maketype} $*
92 retval=$? 92 retval=$?
97 #Normal make if we can connect to an X display 97 #Normal make if we can connect to an X display
98 ${maketype} $* 98 ${maketype} $*
99 retval=$? 99 retval=$?
100 fi 100 fi
101 101
102 return $retval 102 return ${retval}
103} 103}
104 104
105#Same as "make", but setup the Xvfb hack if needed 105#Same as "make", but setup the Xvfb hack if needed
106Xmake() { 106Xmake() {
107 export maketype="make" 107 export maketype="make"

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.27

  ViewVC Help
Powered by ViewVC 1.1.20