summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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-devtools
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-devtools')
-rw-r--r--meta/recipes-devtools/apt/apt-native.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-cross.inc2
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.2.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index 4bf5105dd2..51e1e3b5c4 100644
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
@@ -18,7 +18,7 @@ python do_install_config () {
18 data = infile.read() 18 data = infile.read()
19 infile.close() 19 infile.close()
20 20
21 data = bb.data.expand(data, d) 21 data = d.expand(data)
22 22
23 outdir = os.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt') 23 outdir = os.path.join(d.getVar('D', True), d.getVar('sysconfdir', True), 'apt')
24 if not os.path.exists(outdir): 24 if not os.path.exists(outdir):
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index bf6c2398e8..f550aab27a 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -79,7 +79,7 @@ do_clean[lockfiles] = "${SW}.clean.lock"
79 79
80python workshared_clean () { 80python workshared_clean () {
81 """clear the source directory""" 81 """clear the source directory"""
82 dir = bb.data.expand("${SW}", d) 82 dir = d.expand("${SW}")
83 bb.note("Removing " + dir) 83 bb.note("Removing " + dir)
84 oe.path.remove(dir) 84 oe.path.remove(dir)
85 85
diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index c872e00208..e32412c127 100644
--- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
@@ -1,7 +1,7 @@
1INHIBIT_PACKAGE_STRIP = "1" 1INHIBIT_PACKAGE_STRIP = "1"
2 2
3# Compute how to get from libexecdir to bindir in python (easier than shell) 3# Compute how to get from libexecdir to bindir in python (easier than shell)
4BINRELPATH = "${@oe.path.relative(bb.data.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}", d), bb.data.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}", d))}" 4BINRELPATH = "${@oe.path.relative(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"))}"
5 5
6do_install () { 6do_install () {
7 oe_runmake 'DESTDIR=${D}' install-host 7 oe_runmake 'DESTDIR=${D}' install-host
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index f9a6cc9d5d..a0c34a39cb 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -290,7 +290,7 @@ PACKAGES_append = " perl-modules "
290RRECOMMENDS_perl-modules = "${@d.getVar('PACKAGES', True).replace('${PN}-modules ', '').replace('${PN}-dbg ', '').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ', '').replace('${PN}-doc ', '')}" 290RRECOMMENDS_perl-modules = "${@d.getVar('PACKAGES', True).replace('${PN}-modules ', '').replace('${PN}-dbg ', '').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ', '').replace('${PN}-doc ', '')}"
291 291
292python populate_packages_prepend () { 292python populate_packages_prepend () {
293 libdir = bb.data.expand('${libdir}/perl/${PV}', d) 293 libdir = d.expand('${libdir}/perl/${PV}')
294 do_split_packages(d, libdir, 'auto/(Encode/.[^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 294 do_split_packages(d, libdir, 'auto/(Encode/.[^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
295 do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 295 do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
296 do_split_packages(d, libdir, 'Module/([^\/]*).*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 296 do_split_packages(d, libdir, 'Module/([^\/]*).*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)