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-22 11:35:19 +0000 |
commit | cc2744267f6c6daa594b8c4381d56ac27fe70b81 (patch) | |
tree | 873e26c071fa04f2fe54658c600baf2ed5071616 /meta/classes | |
parent | d60ede331558efc93011dee6f157028174b9c5a1 (diff) | |
download | poky-cc2744267f6c6daa594b8c4381d56ac27fe70b81.tar.gz |
meta: replace uses of bb.data.expand(VARNAME, d) with d.expand(VARNAME)
bb.data.expand(x, d) is deprecated API.
[YOCTO #10678]
(From OE-Core rev: a361babe443da635aed83be46679067457fd6a58)
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 () { | |||
365 | elif include_re.match(line): | 365 | elif include_re.match(line): |
366 | incfile = include_re.match(line).group(1) | 366 | incfile = include_re.match(line).group(1) |
367 | if incfile: | 367 | if incfile: |
368 | incfile = bb.data.expand(incfile, d) | 368 | incfile = d.expand(incfile) |
369 | incfile = bb.utils.which(bbpath, incfile) | 369 | incfile = bb.utils.which(bbpath, incfile) |
370 | if incfile: | 370 | if incfile: |
371 | shutil.copy(incfile, outdir) | 371 | 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 () { | |||
778 | dir = d.getVar(path) or "" | 778 | dir = d.getVar(path) or "" |
779 | if dir == "": | 779 | if dir == "": |
780 | continue | 780 | continue |
781 | fs_perms_table[dir] = fs_perms_entry(bb.data.expand("%s 0755 root root false - - -" % (dir), d)) | 781 | fs_perms_table[dir] = fs_perms_entry(d.expand("%s 0755 root root false - - -" % (dir))) |
782 | 782 | ||
783 | # Now we actually load from the configuration files | 783 | # Now we actually load from the configuration files |
784 | for conf in get_fs_perms_list(d).split(): | 784 | for conf in get_fs_perms_list(d).split(): |
@@ -1801,7 +1801,7 @@ python package_do_pkgconfig () { | |||
1801 | m = field_re.match(l) | 1801 | m = field_re.match(l) |
1802 | if m: | 1802 | if m: |
1803 | hdr = m.group(1) | 1803 | hdr = m.group(1) |
1804 | exp = bb.data.expand(m.group(2), pd) | 1804 | exp = pd.expand(m.group(2)) |
1805 | if hdr == 'Requires': | 1805 | if hdr == 'Requires': |
1806 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() | 1806 | pkgconfig_needed[pkg] += exp.replace(',', ' ').split() |
1807 | 1807 | ||
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() { | |||
28 | bb.note("Removing " + dir) | 28 | bb.note("Removing " + dir) |
29 | oe.path.remove(dir) | 29 | oe.path.remove(dir) |
30 | 30 | ||
31 | dir = "%s.*" % bb.data.expand(d.getVar('STAMP', False), d) | 31 | dir = "%s.*" % d.getVar('STAMP') |
32 | bb.note("Removing " + dir) | 32 | bb.note("Removing " + dir) |
33 | oe.path.remove(dir) | 33 | oe.path.remove(dir) |
34 | 34 | ||