summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-16 17:44:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-19 04:52:49 +0100
commit3a6a38e3c60600ac9272d9e73d1bf05c0ae7e3ae (patch)
tree3327045655ca33c1232eda28c6365e32d6a2dc3e /meta/classes
parent9b5175255b134d5d855234a44316a6a034a1f210 (diff)
downloadpoky-3a6a38e3c60600ac9272d9e73d1bf05c0ae7e3ae.tar.gz
sanity.bbclass: add a sanity check for KDE 4.x konsole in TERMCMD
If the user has specified konsole in TERMCMD and it is version 2.x from KDE 4.x, raise an error as this version will not work for patch resolution purposes (it forks into the background and returns immediately). Addresses [YOCTO #1294] (From OE-Core rev: 843f9af47ffccb7ffdf3039c560bc3e4c88175a2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 6ed43b268f..406740819c 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -337,6 +337,12 @@ def check_sanity(e):
337 term = termcmd.split()[0] 337 term = termcmd.split()[0]
338 if not check_app_exists(term, e.data): 338 if not check_app_exists(term, e.data):
339 messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term 339 messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term
340 elif "konsole" in term:
341 import oe.terminal
342 vernum = oe.terminal.check_konsole_version(term)
343 if vernum:
344 if vernum.split('.')[0] == '2':
345 messages = messages + 'Konsole from KDE 4.x will not work as TERMCMD/TERMCMDRUN, please specify a different terminal or set PATCHRESOLVE = "noop" to disable interactive patch resolution.\n'
340 346
341 if os.path.basename(os.readlink('/bin/sh')) == 'dash': 347 if os.path.basename(os.readlink('/bin/sh')) == 'dash':
342 messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n" 348 messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n"