summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 11:21:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-05 10:23:53 -0800
commitb1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94 (patch)
tree62b315fdc05e03677922a0161fdc7a39e2985466 /meta/recipes-extended
parent22f0df2aa737bda1ae3bce862ee5ceba5b2d204b (diff)
downloadpoky-b1aeaa8b0dcf27ef8dcd87279901c6f5817d9e94.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.30.bb2
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.5.bb6
2 files changed, 4 insertions, 4 deletions
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"
58PACKAGES_DYNAMIC = "lighttpd-module-*" 58PACKAGES_DYNAMIC = "lighttpd-module-*"
59 59
60python populate_packages_prepend () { 60python populate_packages_prepend () {
61 lighttpd_libdir = bb.data.expand('${libdir}', d) 61 lighttpd_libdir = d.expand('${libdir}')
62 do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') 62 do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='')
63} 63}
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 () {
61 d.setVar('FILES_' + pn, nf) 61 d.setVar('FILES_' + pn, nf)
62 62
63 dvar = bb.data.expand('${WORKDIR}/package', d, True) 63 dvar = bb.data.expand('${WORKDIR}/package', d, True)
64 pam_libdir = bb.data.expand('${base_libdir}/security', d) 64 pam_libdir = d.expand('${base_libdir}/security')
65 pam_sbindir = bb.data.expand('${sbindir}', d) 65 pam_sbindir = d.expand('${sbindir}')
66 pam_filterdir = bb.data.expand('${base_libdir}/security/pam_filter', d) 66 pam_filterdir = d.expand('${base_libdir}/security/pam_filter')
67 67
68 do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='') 68 do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='')
69 pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd') 69 pam_plugin_append_file('pam-plugin-unix', pam_sbindir, 'unix_chkpwd')