[OE-core] [Consolidated & Tested 03/35] meta/conf/local.conf.sample: improve terminal examples/comments

[Saul Wold]

From: Paul Eggleton <paul.eggleton at linux.intel.com>

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".

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
 meta/conf/local.conf.sample |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 6bdd314..1f66c89 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -194,8 +194,12 @@ NO32LIBS = "1"
 # when resolving patches which cannot be applied
 # Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN ARE:
 # GNOME, SCREEN, XTERM and KONSOLE
-#TERMCMD = "${KONSOLE_TERMCMD}"
-#TERMCMDRUN = "${KONSOLE_TERMCMDRUN}"
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#TERMCMD = "${XTERM_TERMCMD}"
+#TERMCMDRUN = "${XTERM_TERMCMDRUN}"
+# Alternatively, if you prefer you can disable patch resolution:
+#PATCHRESOLVE = "noop"
 
 # Uncomment this if your host distribution provides the help2man tool.
 #ASSUME_PROVIDED += "help2man-native"
-- 
1.7.3.4