diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/devshell.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/devshell.bbclass')
-rw-r--r-- | meta/classes/devshell.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index be71aff35f..864ace4cb4 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass | |||
@@ -5,14 +5,14 @@ DEVSHELL = "${SHELL}" | |||
5 | python do_devshell () { | 5 | python do_devshell () { |
6 | if d.getVarFlag("do_devshell", "manualfakeroot", True): | 6 | if d.getVarFlag("do_devshell", "manualfakeroot", True): |
7 | d.prependVar("DEVSHELL", "pseudo ") | 7 | d.prependVar("DEVSHELL", "pseudo ") |
8 | fakeenv = d.getVar("FAKEROOTENV", True).split() | 8 | fakeenv = d.getVar("FAKEROOTENV").split() |
9 | for f in fakeenv: | 9 | for f in fakeenv: |
10 | k = f.split("=") | 10 | k = f.split("=") |
11 | d.setVar(k[0], k[1]) | 11 | d.setVar(k[0], k[1]) |
12 | d.appendVar("OE_TERMINAL_EXPORTS", " " + k[0]) | 12 | d.appendVar("OE_TERMINAL_EXPORTS", " " + k[0]) |
13 | d.delVarFlag("do_devshell", "fakeroot") | 13 | d.delVarFlag("do_devshell", "fakeroot") |
14 | 14 | ||
15 | oe_terminal(d.getVar('DEVSHELL', True), 'OpenEmbedded Developer Shell', d) | 15 | oe_terminal(d.getVar('DEVSHELL'), 'OpenEmbedded Developer Shell', d) |
16 | } | 16 | } |
17 | 17 | ||
18 | addtask devshell after do_patch | 18 | addtask devshell after do_patch |
@@ -82,7 +82,7 @@ def devpyshell(d): | |||
82 | more = False | 82 | more = False |
83 | 83 | ||
84 | i = code.InteractiveInterpreter(locals=_context) | 84 | i = code.InteractiveInterpreter(locals=_context) |
85 | print("OE PyShell (PN = %s)\n" % d.getVar("PN", True)) | 85 | print("OE PyShell (PN = %s)\n" % d.getVar("PN")) |
86 | 86 | ||
87 | def prompt(more): | 87 | def prompt(more): |
88 | if more: | 88 | if more: |