summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-02-19 00:48:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-21 09:31:59 +0000
commit74bc2a65ec18c749d9343d9a33eccae93726846c (patch)
treef1ed1448126adb02fe3fab13746f6d29a482296f
parent9979f8ad588564cd9d177e24a28ceefefec4df7d (diff)
downloadopenembedded-core-contrib-74bc2a65ec18c749d9343d9a33eccae93726846c.tar.gz
openembedded-core-contrib-74bc2a65ec18c749d9343d9a33eccae93726846c.tar.bz2
openembedded-core-contrib-74bc2a65ec18c749d9343d9a33eccae93726846c.zip
terminal.bbclass: import oe.terminal for oe.terminal.prioritized()
Fixed: INHERIT += "typecheck" $ bitbake -p ERROR: Failure expanding expression auto none ${@" ".join(o.name for o in oe.terminal.prioritized())} which triggered exception AttributeError: 'module' object has no attribute 'terminal' Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/terminal.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index fd87cfe3d8..9f4c24e906 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -1,8 +1,7 @@
OE_TERMINAL ?= 'auto'
OE_TERMINAL[type] = 'choice'
OE_TERMINAL[choices] = 'auto none \
- ${@" ".join(o.name \
- for o in oe.terminal.prioritized())}'
+ ${@oe_terminal_prioritized()}'
OE_TERMINAL_EXPORTS += 'EXTRA_OEMAKE'
OE_TERMINAL_EXPORTS[type] = 'list'
@@ -10,6 +9,9 @@ OE_TERMINAL_EXPORTS[type] = 'list'
XAUTHORITY ?= "${HOME}/.Xauthority"
SHELL ?= "bash"
+def oe_terminal_prioritized():
+ import oe.terminal
+ return " ".join(o.name for o in oe.terminal.prioritized())
def emit_terminal_func(command, envdata, d):
cmd_func = 'do_terminal'