Patchwork [3/4] meta/conf/local.conf.sample: improve terminal examples/comments

login
register
mail settings
Submitter Paul Eggleton
Date July 26, 2011, 3:33 p.m.
Message ID <555a89ad6f8e908f695d40f1f7ff2d59f1ea2f1a.1311694250.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/8567/
State New, archived
Headers show

Comments

Paul Eggleton - July 26, 2011, 3:33 p.m.
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@linux.intel.com>
---
 meta/conf/local.conf.sample |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 1322202..d8e2383 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -183,8 +183,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"