summaryrefslogtreecommitdiffstats
path: root/meta/classes/terminal.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-02-19 08:48:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-21 09:32:41 (GMT)
commitaeb8964b019333cc773d5254ebe480e3825dee23 (patch)
tree7fc3abc4bf41d2d1ccc29718e883f09c815f5f9d /meta/classes/terminal.bbclass
parentbee556aa0d40215e4ad24cd7ee496adb710ba39b (diff)
downloadpoky-aeb8964b019333cc773d5254ebe480e3825dee23.tar.gz
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' (From OE-Core rev: 74bc2a65ec18c749d9343d9a33eccae93726846c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/terminal.bbclass')
-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 fd87cfe..9f4c24e 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -1,8 +1,7 @@
1OE_TERMINAL ?= 'auto' 1OE_TERMINAL ?= 'auto'
2OE_TERMINAL[type] = 'choice' 2OE_TERMINAL[type] = 'choice'
3OE_TERMINAL[choices] = 'auto none \ 3OE_TERMINAL[choices] = 'auto none \
4 ${@" ".join(o.name \ 4 ${@oe_terminal_prioritized()}'
5 for o in oe.terminal.prioritized())}'
6 5
7OE_TERMINAL_EXPORTS += 'EXTRA_OEMAKE' 6OE_TERMINAL_EXPORTS += 'EXTRA_OEMAKE'
8OE_TERMINAL_EXPORTS[type] = 'list' 7OE_TERMINAL_EXPORTS[type] = 'list'
@@ -10,6 +9,9 @@ OE_TERMINAL_EXPORTS[type] = 'list'
10XAUTHORITY ?= "${HOME}/.Xauthority" 9XAUTHORITY ?= "${HOME}/.Xauthority"
11SHELL ?= "bash" 10SHELL ?= "bash"
12 11
12def oe_terminal_prioritized():
13 import oe.terminal
14 return " ".join(o.name for o in oe.terminal.prioritized())
13 15
14def emit_terminal_func(command, envdata, d): 16def emit_terminal_func(command, envdata, d):
15 cmd_func = 'do_terminal' 17 cmd_func = 'do_terminal'