summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
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/conf/distro
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/conf/distro')
-rw-r--r--meta/conf/distro/include/csl-versions.inc4
-rw-r--r--meta/conf/distro/include/tcmode-external-csl.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/include/csl-versions.inc b/meta/conf/distro/include/csl-versions.inc
index 22e83946a1..6b8b2c5b96 100644
--- a/meta/conf/distro/include/csl-versions.inc
+++ b/meta/conf/distro/include/csl-versions.inc
@@ -39,7 +39,7 @@ def csl_get_gcc_version(d):
39 39
40def csl_get_libc_version(d): 40def csl_get_libc_version(d):
41 import os,bb 41 import os,bb
42 syspath = bb.data.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}', d) 42 syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}')
43 if not syspath: 43 if not syspath:
44 return 'UNKNOWN' 44 return 'UNKNOWN'
45 45
@@ -55,7 +55,7 @@ def csl_get_libc_version(d):
55 55
56def csl_get_kernel_version(d): 56def csl_get_kernel_version(d):
57 import os,bb 57 import os,bb
58 syspath = bb.data.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}', d) 58 syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}')
59 if not syspath: 59 if not syspath:
60 return 'UNKNOWN' 60 return 'UNKNOWN'
61 61
diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc
index 1ff808d9e7..7bb8453732 100644
--- a/meta/conf/distro/include/tcmode-external-csl.inc
+++ b/meta/conf/distro/include/tcmode-external-csl.inc
@@ -92,7 +92,7 @@ def populate_toolchain_links(d):
92 d = d.createCopy() 92 d = d.createCopy()
93 d.finalize() 93 d.finalize()
94 94
95 pattern = bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*', d) 95 pattern = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*')
96 files = glob(pattern) 96 files = glob(pattern)
97 if not files: 97 if not files:
98 bb.fatal("Unable to populate toolchain binary symlinks") 98 bb.fatal("Unable to populate toolchain binary symlinks")