summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-03 22:02:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-04 17:05:53 +0000
commit426ad821065c50fc008a140e5b2334d2c97511c3 (patch)
treec0c5fc0c6a22e9c12dbbb20307328132ef2bf4ca /meta-yocto/conf
parent9d1f10ed012de6976141a29ba483e0b96781fe28 (diff)
downloadpoky-426ad821065c50fc008a140e5b2334d2c97511c3.tar.gz
bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead
(From OE-Core rev: ddb825c87dd3e59d50841a993080a00d1459b1e7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Yes, this one is against meta-yocto, I'll fix it to apply the same change to OE-Core's local.conf.sample in the final version]
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/local.conf.sample12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index da3f8df9a0..ca8636c151 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -190,20 +190,16 @@ USER_CLASSES ?= "image-mklibs image-prelink"
190# Under certain circumstances the system may need input from you and to do this it 190# Under certain circumstances the system may need input from you and to do this it
191# can launch an interactive shell. It needs to do this since the build is 191# can launch an interactive shell. It needs to do this since the build is
192# multithreaded and needs to be able to handle the case where more than one parallel 192# multithreaded and needs to be able to handle the case where more than one parallel
193# process may require the user's attention. The default is to use xterm. 193# process may require the user's attention. The default is iterate over the available
194# terminal types to find one that works.
194# 195#
195# Examples of the occasions this may happen are when resolving patches which cannot 196# Examples of the occasions this may happen are when resolving patches which cannot
196# be applied, to use the devshell or the kernel menuconfig 197# be applied, to use the devshell or the kernel menuconfig
197# 198#
198# If you do not use (or have installed) xterm you will need to 199# Supported values are auto, gnome, xfce, rxvt, xcreen, konsole (3.x only), none
199# uncomment these variables and set them to the terminal you wish to use
200#
201# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN are:
202# GNOME, SCREEN, XTERM and KONSOLE
203# Note: currently, Konsole support only works for KDE 3.x due to the way 200# Note: currently, Konsole support only works for KDE 3.x due to the way
204# newer Konsole versions behave 201# newer Konsole versions behave
205#TERMCMD = "${XTERM_TERMCMD}" 202#OE_TERMINAL = "auto"
206#TERMCMDRUN = "${XTERM_TERMCMDRUN}"
207# By default disable interactive patch resolution (tasks will just fail instead): 203# By default disable interactive patch resolution (tasks will just fail instead):
208PATCHRESOLVE = "noop" 204PATCHRESOLVE = "noop"
209 205