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

Diff of /eclass/virtualx.eclass

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

Revision 1.31 Revision 1.42
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2012 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.31 2009/10/19 23:52:39 abcd Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.42 2012/10/02 08:14:36 kensington Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6#
7# This eclass can be used for packages that needs a working X environment to build
8 4
9# Is a dependency on xorg-server and xhost needed? 5# @ECLASS: virtualx.eclass
10# Valid values are "always", "tests", and "manual" 6# @MAINTAINER:
11VIRTUALX_REQUIRED="${VIRTUALX_REQUIRED:-tests}" 7# x11@gentoo.org
8# @AUTHOR:
9# Original author: Martin Schlemmer <azarah@gentoo.org>
10# @BLURB: This eclass can be used for packages that needs a working X environment to build.
12 11
12# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
13# @DESCRIPTION:
14# Variable specifying the dependency on xorg-server and xhost.
15# Possible special values are "always" and "manual", which specify
16# the dependency to be set unconditionaly or not at all.
17# Any other value is taken as useflag desired to be in control of
18# the dependency (eg. VIRTUALX_REQUIRED="kde" will add the dependency
19# into "kde? ( )" and add kde into IUSE.
20: ${VIRTUALX_REQUIRED:=test}
21
22# @ECLASS-VARIABLE: VIRTUALX_DEPEND
23# @DESCRIPTION:
13# Dep string available for use outside of eclass, in case a more 24# Dep string available for use outside of eclass, in case a more
14# complicated dep is needed 25# complicated dep is needed.
15VIRTUALX_DEPEND="x11-base/xorg-server 26# You can specify the variable BEFORE inherit to add more dependencies.
27VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
28 !prefix? ( x11-base/xorg-server[xvfb] )
16 x11-apps/xhost" 29 x11-apps/xhost
30"
31
32# @ECLASS-VARIABLE: VIRTUALX_COMMAND
33# @DESCRIPTION:
34# Command (or eclass function call) to be run in the X11 environment
35# (within virtualmake function).
36: ${VIRTUALX_COMMAND:="emake"}
37
38has "${EAPI:-0}" 0 1 && die "virtualx eclass require EAPI=2 or newer."
17 39
18case ${VIRTUALX_REQUIRED} in 40case ${VIRTUALX_REQUIRED} in
41 manual)
42 ;;
19 always) 43 always)
20 DEPEND="${VIRTUALX_DEPEND}" 44 DEPEND="${VIRTUALX_DEPEND}"
21 RDEPEND="" 45 RDEPEND=""
22 ;; 46 ;;
23 tests) 47 optional|tests)
48 # deprecated section YAY.
49 ewarn "QA: VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
50 ewarn "QA: You can drop the variable definition completely from ebuild,"
51 ewarn "QA: because it is default behaviour."
52
53 if [[ -n ${VIRTUALX_USE} ]]; then
54 # so they like to specify the useflag
55 ewarn "QA: VIRTUALX_USE variable is deprecated."
56 ewarn "QA: Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
57 ewarn "QA: to achieve the same behaviour."
58 fi
59
60 [[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test"
24 DEPEND="test? ( ${VIRTUALX_DEPEND} )" 61 DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
25 RDEPEND="" 62 RDEPEND=""
26 IUSE="test" 63 IUSE="${VIRTUALX_USE}"
27 ;;
28 manual)
29 ;; 64 ;;
30 *) 65 *)
31 eerror "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED" 66 DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
32 eerror "Valid values are:" 67 RDEPEND=""
33 eerror " always" 68 IUSE="${VIRTUALX_REQUIRED}"
34 eerror " tests"
35 eerror " manual"
36 die "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
37 ;; 69 ;;
38esac 70esac
39 71
40DESCRIPTION="Based on the $ECLASS eclass" 72# @FUNCTION: virtualmake
73# @DESCRIPTION:
74# Function which attach to running X session or start new Xvfb session
75# where the VIRTUALX_COMMAND variable content gets executed.
76virtualmake() {
77 debug-print-function ${FUNCNAME} "$@"
41 78
42# 79 local i=0
43# Brian Harring <ferringb@gentoo.org> 11/04/2004
44# do not disable the sandbox during the depend phase.
45# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox.
46#
47if [[ ${EBUILD_PHASE/depend} == "${EBUILD_PHASE}" ]] ; then
48 [[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || :
49fi
50
51virtualmake() {
52 local retval=0 80 local retval=0
53 local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}" 81 local OLD_SANDBOX_ON="${SANDBOX_ON}"
54 local XVFB=$(type -p Xvfb) 82 local XVFB=$(type -p Xvfb)
55 local XHOST=$(type -p xhost) 83 local XHOST=$(type -p xhost)
84 local xvfbargs="-screen 0 1280x1024x24"
85
86 # backcompat for maketype
87 if [[ -n ${maketype} ]]; then
88 ewarn "QA: ebuild is exporting \$maketype=${maketype}"
89 ewarn "QA: Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead."
90 ewarn "QA: Setting VIRTUALX_COMMAND to \$maketype conveniently for now."
91 VIRTUALX_COMMAND=${maketype}
92 fi
56 93
57 # If $DISPLAY is not set, or xhost cannot connect to an X 94 # If $DISPLAY is not set, or xhost cannot connect to an X
58 # display, then do the Xvfb hack. 95 # display, then do the Xvfb hack.
59 if [[ -n ${XVFB} && -n ${XHOST} ]] && \ 96 if [[ -n ${XVFB} && -n ${XHOST} ]] && \
60 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then 97 ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
98 debug-print "${FUNCNAME}: running Xvfb hack"
61 export XAUTHORITY= 99 export XAUTHORITY=
62 # The following is derived from Mandrake's hack to allow 100 # The following is derived from Mandrake's hack to allow
63 # compiling without the X display 101 # compiling without the X display
64 102
65 einfo "Scanning for an open DISPLAY to start Xvfb ..." 103 einfo "Scanning for an open DISPLAY to start Xvfb ..."
66
67 # We really do not want SANDBOX enabled here
68 export SANDBOX_DISABLED="1"
69
70 local i=0
71 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
72
73 # If we are in a chrooted environment, and there is already a 104 # If we are in a chrooted environment, and there is already a
74 # X server started outside of the chroot, Xvfb will fail to start 105 # X server started outside of the chroot, Xvfb will fail to start
75 # on the same display (most cases this is :0 ), so make sure 106 # on the same display (most cases this is :0 ), so make sure
76 # Xvfb is started, else bump the display number 107 # Xvfb is started, else bump the display number
77 # 108 #
78 # Azarah - 5 May 2002 109 # Azarah - 5 May 2002
79 # 110 XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
80 # Changed the mode from 800x600x32 to 800x600x24 because the mfb 111 debug-print "${FUNCNAME}: XDISPLAY=${XDISPLAY}"
81 # support has been dropped in Xvfb in the xorg-x11 pre-releases. 112
82 # For now only depths up to 24-bit are supported. 113 # We really do not want SANDBOX enabled here
83 # 114 export SANDBOX_ON="0"
84 # Sven Wegener <swegener@gentoo.org> - 22 Aug 2004 115
85 # 116 debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
86 # Use "-fp built-ins" because it's only part of the default font path 117 ${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
87 # for Xorg but not the other DDXs (Xvfb, Kdrive, etc). Temporarily fixes
88 # bug 278487 until xorg-server is properly patched
89 #
90 # RĂ©mi Cardona <remi@gentoo.org> (10 Aug 2009)
91 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
92 sleep 2 118 sleep 2
93 119
94 local start=${XDISPLAY} 120 local start=${XDISPLAY}
95 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do 121 while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
96 # Stop trying after 15 tries 122 # Stop trying after 15 tries
97 if ((XDISPLAY - start > 15)) ; then 123 if ((XDISPLAY - start > 15)) ; then
98 124 eerror "'${XVFB} :${XDISPLAY} ${xvfbargs}' returns:"
99 eerror "" 125 echo
100 eerror "Unable to start Xvfb." 126 ${XVFB} :${XDISPLAY} ${xvfbargs}
101 eerror "" 127 echo
102 eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
103 eerror ""
104 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
105 eerror ""
106 eerror "If possible, correct the above error and try your emerge again." 128 eerror "If possible, correct the above error and try your emerge again."
107 eerror "" 129 die "Unable to start Xvfb"
108 die
109 fi 130 fi
110 131
111 ((XDISPLAY++)) 132 ((XDISPLAY++))
112 ${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null & 133 debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
134 ${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
113 sleep 2 135 sleep 2
114 done 136 done
115 137
116 # Now enable SANDBOX again if needed. 138 # Now enable SANDBOX again if needed.
117 export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}" 139 export SANDBOX_ON="${OLD_SANDBOX_ON}"
118 140
119 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..." 141 einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
120 142
121 export DISPLAY=:${XDISPLAY} 143 export DISPLAY=:${XDISPLAY}
122 #Do not break on error, but setup $retval, as we need 144 # Do not break on error, but setup $retval, as we need
123 #to kill Xvfb 145 # to kill Xvfb
124 ${maketype} "$@" 146 debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
147 nonfatal ${VIRTUALX_COMMAND} "$@"
125 retval=$? 148 retval=$?
126 149
127 #Now kill Xvfb 150 # Now kill Xvfb
128 kill $(cat /tmp/.X${XDISPLAY}-lock) 151 kill $(cat /tmp/.X${XDISPLAY}-lock)
129 else 152 else
153 debug-print "${FUNCNAME}: attaching to running X display"
130 #Normal make if we can connect to an X display 154 # Normal make if we can connect to an X display
131 ${maketype} "$@" 155 debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
156 ${VIRTUALX_COMMAND} "$@"
132 retval=$? 157 retval=$?
133 fi 158 fi
134 159
135 return ${retval} 160 # die if our command failed
161 [[ ${retval} -ne 0 ]] && die "${FUNCNAME}: the ${VIRTUALX_COMMAND} failed."
162
163 return 0 # always return 0, it can be altered by failed kill for Xvfb
136} 164}
137 165
166# @FUNCTION: Xmake
167# @DESCRIPTION:
138#Same as "make", but setup the Xvfb hack if needed 168# Same as "make", but set up the Xvfb hack if needed.
169# Deprecated call.
139Xmake() { 170Xmake() {
140 export maketype="make" 171 debug-print-function ${FUNCNAME} "$@"
141 virtualmake "$@" 172
173 ewarn "QA: you should not execute make directly"
174 ewarn "QA: rather execute Xemake -j1 if you have issues with parallel make"
175 VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
142} 176}
143 177
178# @FUNCTION: Xemake
179# @DESCRIPTION:
144#Same as "emake", but setup the Xvfb hack if needed 180# Same as "emake", but set up the Xvfb hack if needed.
145Xemake() { 181Xemake() {
146 export maketype="emake" 182 debug-print-function ${FUNCNAME} "$@"
147 virtualmake "$@" 183
184 VIRTUALX_COMMAND="emake" virtualmake "$@"
148} 185}
149 186
187# @FUNCTION: Xeconf
188# @DESCRIPTION:
150#Same as "econf", but setup the Xvfb hack if needed 189# Same as "econf", but set up the Xvfb hack if needed.
151Xeconf() { 190Xeconf() {
152 export maketype="econf" 191 debug-print-function ${FUNCNAME} "$@"
153 virtualmake "$@" 192
193 VIRTUALX_COMMAND="econf" virtualmake "$@"
154} 194}

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.42

  ViewVC Help
Powered by ViewVC 1.1.20