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/chrpath.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/chrpath.bbclass')
-rw-r--r-- | meta/classes/chrpath.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index f183b4aeeb..ad3c3975a5 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass | |||
@@ -44,7 +44,7 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d): | |||
44 | p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 44 | p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
45 | out, err = p.communicate() | 45 | out, err = p.communicate() |
46 | if p.returncode != 0: | 46 | if p.returncode != 0: |
47 | bb.fatal("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN', True), p.returncode, out, err)) | 47 | bb.fatal("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN'), p.returncode, out, err)) |
48 | 48 | ||
49 | def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): | 49 | def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d): |
50 | import subprocess as sub | 50 | import subprocess as sub |
@@ -72,7 +72,7 @@ def process_dir (rootdir, directory, d): | |||
72 | cmd = d.expand('${CHRPATH_BIN}') | 72 | cmd = d.expand('${CHRPATH_BIN}') |
73 | tmpdir = os.path.normpath(d.getVar('TMPDIR', False)) | 73 | tmpdir = os.path.normpath(d.getVar('TMPDIR', False)) |
74 | baseprefix = os.path.normpath(d.expand('${base_prefix}')) | 74 | baseprefix = os.path.normpath(d.expand('${base_prefix}')) |
75 | hostos = d.getVar("HOST_OS", True) | 75 | hostos = d.getVar("HOST_OS") |
76 | 76 | ||
77 | #bb.debug("Checking %s for binaries to process" % directory) | 77 | #bb.debug("Checking %s for binaries to process" % directory) |
78 | if not os.path.exists(directory): | 78 | if not os.path.exists(directory): |