From b1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 11:21:22 +0000 Subject: meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx) sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie --- meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb | 2 +- meta/recipes-extended/pam/libpam_1.1.5.bb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb index 2c247f0531..3ae38671f8 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb @@ -58,6 +58,6 @@ CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" PACKAGES_DYNAMIC = "lighttpd-module-*" python populate_packages_prepend () { - lighttpd_libdir = bb.data.expand('${libdir}', d) + lighttpd_libdir = d.expand('${libdir}') do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') } diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.5.bb index 8dd5ac5251..08ce1d13b3 100644 --- a/meta/recipes-extended/pam/libpam_1.1.5.bb +++ b/meta/recipes-extended/pam/libpam_1.1.5.bb @@ -61,9 +61,9 @@ python populate_packages_prepend () { d.setVar('FILES_' + pn, nf) dvar = bb.data.expand('${WORKDIR}/package', d, True) - pam_libdir = bb.data.expand('${base_libdir}/security', d) - pam_sbindir = bb.data.expand('${sbindir}', d) - pam_filterdir = bb.data.expand('${base_libdir}/security/pam_filter', d) + pam_libdir = d.expand('${base_libdir}/security') + pam_sbindir = d.expand('${sbindir}') + pam_filterdir = d.expand('${base_libdir}/security/pam_filter') do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='') pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd') -- cgit v1.2.3-54-g00ecf