diff options
| -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 | ||||
| -rw-r--r-- | meta/lib/oe/patch.py | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/pam/libpam_1.3.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb | 2 |
6 files changed, 7 insertions, 7 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) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index aaa2d3aabd..f1ab3dd809 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -81,7 +81,7 @@ class PatchSet(object): patch[param] = PatchSet.defaults[param] 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"]) diff --git a/meta/recipes-extended/pam/libpam_1.3.0.bb b/meta/recipes-extended/pam/libpam_1.3.0.bb index 67b9d53d33..df56d27627 100644 --- a/meta/recipes-extended/pam/libpam_1.3.0.bb +++ b/meta/recipes-extended/pam/libpam_1.3.0.bb @@ -116,7 +116,7 @@ python populate_packages_prepend () { d.setVar('RPROVIDES_' + pkg, provides) 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_sbindir = d.expand('${sbindir}') pam_filterdir = d.expand('${base_libdir}/security/pam_filter') diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb index 3928fb1cb9..16686a0445 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.1.bb @@ -59,7 +59,7 @@ do_install_append() { } 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='')) d.setVar("RDEPENDS_alsa-plugins", packages) } |