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>
This commit is contained in:
parent
d60ede3315
commit
cc2744267f
|
@ -365,7 +365,7 @@ python do_ar_recipe () {
|
||||||
elif include_re.match(line):
|
elif include_re.match(line):
|
||||||
incfile = include_re.match(line).group(1)
|
incfile = include_re.match(line).group(1)
|
||||||
if incfile:
|
if incfile:
|
||||||
incfile = bb.data.expand(incfile, d)
|
incfile = d.expand(incfile)
|
||||||
incfile = bb.utils.which(bbpath, incfile)
|
incfile = bb.utils.which(bbpath, incfile)
|
||||||
if incfile:
|
if incfile:
|
||||||
shutil.copy(incfile, outdir)
|
shutil.copy(incfile, outdir)
|
||||||
|
|
|
@ -778,7 +778,7 @@ python fixup_perms () {
|
||||||
dir = d.getVar(path) or ""
|
dir = d.getVar(path) or ""
|
||||||
if dir == "":
|
if dir == "":
|
||||||
continue
|
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
|
# Now we actually load from the configuration files
|
||||||
for conf in get_fs_perms_list(d).split():
|
for conf in get_fs_perms_list(d).split():
|
||||||
|
@ -1801,7 +1801,7 @@ python package_do_pkgconfig () {
|
||||||
m = field_re.match(l)
|
m = field_re.match(l)
|
||||||
if m:
|
if m:
|
||||||
hdr = m.group(1)
|
hdr = m.group(1)
|
||||||
exp = bb.data.expand(m.group(2), pd)
|
exp = pd.expand(m.group(2))
|
||||||
if hdr == 'Requires':
|
if hdr == 'Requires':
|
||||||
pkgconfig_needed[pkg] += exp.replace(',', ' ').split()
|
pkgconfig_needed[pkg] += exp.replace(',', ' ').split()
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ python do_clean() {
|
||||||
bb.note("Removing " + dir)
|
bb.note("Removing " + dir)
|
||||||
oe.path.remove(dir)
|
oe.path.remove(dir)
|
||||||
|
|
||||||
dir = "%s.*" % bb.data.expand(d.getVar('STAMP', False), d)
|
dir = "%s.*" % d.getVar('STAMP')
|
||||||
bb.note("Removing " + dir)
|
bb.note("Removing " + dir)
|
||||||
oe.path.remove(dir)
|
oe.path.remove(dir)
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ class PatchSet(object):
|
||||||
patch[param] = PatchSet.defaults[param]
|
patch[param] = PatchSet.defaults[param]
|
||||||
|
|
||||||
if patch.get("remote"):
|
if patch.get("remote"):
|
||||||
patch["file"] = bb.data.expand(bb.fetch2.localpath(patch["remote"], self.d), self.d)
|
patch["file"] = self.d.expand(bb.fetch2.localpath(patch["remote"], self.d))
|
||||||
|
|
||||||
patch["filemd5"] = bb.utils.md5_file(patch["file"])
|
patch["filemd5"] = bb.utils.md5_file(patch["file"])
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ python populate_packages_prepend () {
|
||||||
d.setVar('RPROVIDES_' + pkg, provides)
|
d.setVar('RPROVIDES_' + pkg, provides)
|
||||||
|
|
||||||
mlprefix = d.getVar('MLPREFIX') or ''
|
mlprefix = d.getVar('MLPREFIX') or ''
|
||||||
dvar = bb.data.expand('${WORKDIR}/package', d, True)
|
dvar = d.expand('${WORKDIR}/package')
|
||||||
pam_libdir = d.expand('${base_libdir}/security')
|
pam_libdir = d.expand('${base_libdir}/security')
|
||||||
pam_sbindir = d.expand('${sbindir}')
|
pam_sbindir = d.expand('${sbindir}')
|
||||||
pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
|
pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
|
||||||
|
|
|
@ -59,7 +59,7 @@ do_install_append() {
|
||||||
}
|
}
|
||||||
|
|
||||||
python populate_packages_prepend() {
|
python populate_packages_prepend() {
|
||||||
plugindir = bb.data.expand('${libdir}/alsa-lib/', d)
|
plugindir = d.expand('${libdir}/alsa-lib/')
|
||||||
packages = " ".join(do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends=''))
|
packages = " ".join(do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends=''))
|
||||||
d.setVar("RDEPENDS_alsa-plugins", packages)
|
d.setVar("RDEPENDS_alsa-plugins", packages)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue