From 426ad821065c50fc008a140e5b2334d2c97511c3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 3 Nov 2011 22:02:43 +0000 Subject: bitbake.conf: Drop remaining TERMCMD pieces and document OE_TERMINAL usage instead (From OE-Core rev: ddb825c87dd3e59d50841a993080a00d1459b1e7) Signed-off-by: Richard Purdie [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] --- meta-yocto/conf/local.conf.sample | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'meta-yocto') 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" # Under certain circumstances the system may need input from you and to do this it # can launch an interactive shell. It needs to do this since the build is # multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is to use xterm. +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. # # Examples of the occasions this may happen are when resolving patches which cannot # be applied, to use the devshell or the kernel menuconfig # -# If you do not use (or have installed) xterm you will need to -# uncomment these variables and set them to the terminal you wish to use -# -# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN are: -# GNOME, SCREEN, XTERM and KONSOLE +# Supported values are auto, gnome, xfce, rxvt, xcreen, konsole (3.x only), none # Note: currently, Konsole support only works for KDE 3.x due to the way # newer Konsole versions behave -#TERMCMD = "${XTERM_TERMCMD}" -#TERMCMDRUN = "${XTERM_TERMCMDRUN}" +#OE_TERMINAL = "auto" # By default disable interactive patch resolution (tasks will just fail instead): PATCHRESOLVE = "noop" -- cgit v1.2.3-54-g00ecf