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/staging.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/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index bfabd06f3f..72a7421ba6 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -69,8 +69,8 @@ sysroot_stage_all() { | |||
69 | python sysroot_strip () { | 69 | python sysroot_strip () { |
70 | import stat, errno | 70 | import stat, errno |
71 | 71 | ||
72 | dvar = d.getVar('SYSROOT_DESTDIR', True) | 72 | dvar = d.getVar('SYSROOT_DESTDIR') |
73 | pn = d.getVar('PN', True) | 73 | pn = d.getVar('PN') |
74 | 74 | ||
75 | os.chdir(dvar) | 75 | os.chdir(dvar) |
76 | 76 | ||
@@ -103,9 +103,9 @@ python sysroot_strip () { | |||
103 | 103 | ||
104 | elffiles = {} | 104 | elffiles = {} |
105 | inodes = {} | 105 | inodes = {} |
106 | libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir", True)) | 106 | libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir")) |
107 | baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir", True)) | 107 | baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir")) |
108 | if (d.getVar('INHIBIT_SYSROOT_STRIP', True) != '1'): | 108 | if (d.getVar('INHIBIT_SYSROOT_STRIP') != '1'): |
109 | # | 109 | # |
110 | # First lets figure out all of the files we may have to process | 110 | # First lets figure out all of the files we may have to process |
111 | # | 111 | # |
@@ -136,7 +136,7 @@ python sysroot_strip () { | |||
136 | elf_file = isELF(file) | 136 | elf_file = isELF(file) |
137 | if elf_file & 1: | 137 | if elf_file & 1: |
138 | if elf_file & 2: | 138 | if elf_file & 2: |
139 | if 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn, True) or "").split(): | 139 | if 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split(): |
140 | bb.note("Skipping file %s from %s for already-stripped QA test" % (file[len(dvar):], pn)) | 140 | bb.note("Skipping file %s from %s for already-stripped QA test" % (file[len(dvar):], pn)) |
141 | else: | 141 | else: |
142 | bb.warn("File '%s' from %s was already stripped, this will prevent future debugging!" % (file[len(dvar):], pn)) | 142 | bb.warn("File '%s' from %s was already stripped, this will prevent future debugging!" % (file[len(dvar):], pn)) |
@@ -154,7 +154,7 @@ python sysroot_strip () { | |||
154 | # | 154 | # |
155 | # Now strip them (in parallel) | 155 | # Now strip them (in parallel) |
156 | # | 156 | # |
157 | strip = d.getVar("STRIP", True) | 157 | strip = d.getVar("STRIP") |
158 | sfiles = [] | 158 | sfiles = [] |
159 | for file in elffiles: | 159 | for file in elffiles: |
160 | elf_file = int(elffiles[file]) | 160 | elf_file = int(elffiles[file]) |
@@ -211,13 +211,13 @@ def sysroot_checkhashes(covered, tasknames, fnids, fns, d, invalidtasks = None): | |||
211 | python do_populate_sysroot () { | 211 | python do_populate_sysroot () { |
212 | bb.build.exec_func("sysroot_stage_all", d) | 212 | bb.build.exec_func("sysroot_stage_all", d) |
213 | bb.build.exec_func("sysroot_strip", d) | 213 | bb.build.exec_func("sysroot_strip", d) |
214 | for f in (d.getVar('SYSROOT_PREPROCESS_FUNCS', True) or '').split(): | 214 | for f in (d.getVar('SYSROOT_PREPROCESS_FUNCS') or '').split(): |
215 | bb.build.exec_func(f, d) | 215 | bb.build.exec_func(f, d) |
216 | pn = d.getVar("PN", True) | 216 | pn = d.getVar("PN") |
217 | multiprov = d.getVar("MULTI_PROVIDER_WHITELIST", True).split() | 217 | multiprov = d.getVar("MULTI_PROVIDER_WHITELIST").split() |
218 | provdir = d.expand("${SYSROOT_DESTDIR}${base_prefix}/sysroot-providers/") | 218 | provdir = d.expand("${SYSROOT_DESTDIR}${base_prefix}/sysroot-providers/") |
219 | bb.utils.mkdirhier(provdir) | 219 | bb.utils.mkdirhier(provdir) |
220 | for p in d.getVar("PROVIDES", True).split(): | 220 | for p in d.getVar("PROVIDES").split(): |
221 | if p in multiprov: | 221 | if p in multiprov: |
222 | continue | 222 | continue |
223 | p = p.replace("/", "_") | 223 | p = p.replace("/", "_") |