summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-26 11:33:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 12:02:32 +0100
commitc30e58cbc94d749e58cdd906bda1879b9277d0ac (patch)
tree1a13b2bbbc60e80970a29be56b9b8d7f51c7a05a /meta-yocto
parent9545c8bc64c33959f5f6b02966b9bd812e796226 (diff)
downloadpoky-c30e58cbc94d749e58cdd906bda1879b9277d0ac.tar.gz
meta/conf/local.conf.sample: improve terminal examples/comments
Default to XTERM_TERM* instead of KONSOLE_TERM* since Konsole support only works for KDE 3.x, and note this in the comments (see Yocto bug 1294 for further details.) Also add a comment about PATCHRESOLVE = "noop". (From OE-Core rev: 4c88733f8bace5bb6503ebfe5238e96fe424e6d0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/local.conf.sample8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 3ed3805544..64b61ba92b 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -210,8 +210,12 @@ NO32LIBS = "1"
210# when resolving patches which cannot be applied 210# when resolving patches which cannot be applied
211# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN ARE: 211# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN ARE:
212# GNOME, SCREEN, XTERM and KONSOLE 212# GNOME, SCREEN, XTERM and KONSOLE
213#TERMCMD = "${KONSOLE_TERMCMD}" 213# Note: currently, Konsole support only works for KDE 3.x due to the way
214#TERMCMDRUN = "${KONSOLE_TERMCMDRUN}" 214# newer Konsole versions behave
215#TERMCMD = "${XTERM_TERMCMD}"
216#TERMCMDRUN = "${XTERM_TERMCMDRUN}"
217# Alternatively, if you prefer you can disable patch resolution:
218#PATCHRESOLVE = "noop"
215 219
216# The network based PR service host and port 220# The network based PR service host and port
217#PRSERV_HOST = "localhost" 221#PRSERV_HOST = "localhost"