diff options
| author | Joshua Lock <joshua.g.lock@intel.com> | 2017-03-17 15:53:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-21 22:42:59 +0000 |
| commit | a361babe443da635aed83be46679067457fd6a58 (patch) | |
| tree | fd1828f316cb001ba1d84d5442f9f03586bea9d4 /meta/classes | |
| parent | 716e0524cfbcac2eb272be1014280833b74bc5c4 (diff) | |
| download | openembedded-core-a361babe443da635aed83be46679067457fd6a58.tar.gz openembedded-core-a361babe443da635aed83be46679067457fd6a58.tar.bz2 openembedded-core-a361babe443da635aed83be46679067457fd6a58.zip | |
meta: replace uses of bb.data.expand(VARNAME, d) with d.expand(VARNAME)
bb.data.expand(x, d) is deprecated API.
[YOCTO #10678]
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/archiver.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/utility-tasks.bbclass | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index ee4790dd68..2c04557f79 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -365,7 +365,7 @@ python do_ar_recipe () { elif include_re.match(line): incfile = include_re.match(line).group(1) if incfile: - incfile = bb.data.expand(incfile, d) + incfile = d.expand(incfile) incfile = bb.utils.which(bbpath, incfile) if incfile: shutil.copy(incfile, outdir) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 467f5f1c5a..034da840bd 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -778,7 +778,7 @@ python fixup_perms () { dir = d.getVar(path) or "" if dir == "": continue - fs_perms_table[dir] = fs_perms_entry(bb.data.expand("%s 0755 root root false - - -" % (dir), d)) + fs_perms_table[dir] = fs_perms_entry(d.expand("%s 0755 root root false - - -" % (dir))) # Now we actually load from the configuration files for conf in get_fs_perms_list(d).split(): @@ -1801,7 +1801,7 @@ python package_do_pkgconfig () { m = field_re.match(l) if m: hdr = m.group(1) - exp = bb.data.expand(m.group(2), pd) + exp = pd.expand(m.group(2)) if hdr == 'Requires': pkgconfig_needed[pkg] += exp.replace(',', ' ').split() diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass index da69c3a2fb..587bfd4ab5 100644 --- a/meta/classes/utility-tasks.bbclass +++ b/meta/classes/utility-tasks.bbclass @@ -28,7 +28,7 @@ python do_clean() { bb.note("Removing " + dir) oe.path.remove(dir) - dir = "%s.*" % bb.data.expand(d.getVar('STAMP', False), d) + dir = "%s.*" % d.getVar('STAMP') bb.note("Removing " + dir) oe.path.remove(dir) |