diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/terminal.bbclass | 6 |
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 @@ | |||
1 | OE_TERMINAL ?= 'auto' | 1 | OE_TERMINAL ?= 'auto' |
2 | OE_TERMINAL[type] = 'choice' | 2 | OE_TERMINAL[type] = 'choice' |
3 | OE_TERMINAL[choices] = 'auto none \ | 3 | OE_TERMINAL[choices] = 'auto none \ |
4 | ${@" ".join(o.name \ | 4 | ${@oe_terminal_prioritized()}' |
5 | for o in oe.terminal.prioritized())}' | ||
6 | 5 | ||
7 | OE_TERMINAL_EXPORTS += 'EXTRA_OEMAKE' | 6 | OE_TERMINAL_EXPORTS += 'EXTRA_OEMAKE' |
8 | OE_TERMINAL_EXPORTS[type] = 'list' | 7 | OE_TERMINAL_EXPORTS[type] = 'list' |
@@ -10,6 +9,9 @@ OE_TERMINAL_EXPORTS[type] = 'list' | |||
10 | XAUTHORITY ?= "${HOME}/.Xauthority" | 9 | XAUTHORITY ?= "${HOME}/.Xauthority" |
11 | SHELL ?= "bash" | 10 | SHELL ?= "bash" |
12 | 11 | ||
12 | def oe_terminal_prioritized(): | ||
13 | import oe.terminal | ||
14 | return " ".join(o.name for o in oe.terminal.prioritized()) | ||
13 | 15 | ||
14 | def emit_terminal_func(command, envdata, d): | 16 | def emit_terminal_func(command, envdata, d): |
15 | cmd_func = 'do_terminal' | 17 | cmd_func = 'do_terminal' |