From 3a6a38e3c60600ac9272d9e73d1bf05c0ae7e3ae Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 16 Sep 2011 17:44:45 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/classes/sanity.bbclass') 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): term = termcmd.split()[0] if not check_app_exists(term, e.data): 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 + elif "konsole" in term: + import oe.terminal + vernum = oe.terminal.check_konsole_version(term) + if vernum: + if vernum.split('.')[0] == '2': + 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' if os.path.basename(os.readlink('/bin/sh')) == 'dash': 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" -- cgit v1.2.3-54-g00ecf