diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 11:21:22 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:33:18 -0800 |
| commit | 065dab7480ea0fae66db4b5a01d09814b1f38e03 (patch) | |
| tree | 7918d9ebf20c38ccbffca4c79d7b8993e9d6f20d /meta/conf/distro | |
| parent | 8144d51511956a6e046e3976bb4c4a08f1a29c79 (diff) | |
| download | openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.gz openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.bz2 openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.xz openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.zip | |
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.inc | 4 | ||||
| -rw-r--r-- | meta/conf/distro/include/tcmode-external-csl.inc | 2 |
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 22e83946a..6b8b2c5b9 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): def csl_get_libc_version(d): import os,bb - syspath = bb.data.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}', d) + syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}') if not syspath: return 'UNKNOWN' @@ -55,7 +55,7 @@ def csl_get_libc_version(d): def csl_get_kernel_version(d): import os,bb - syspath = bb.data.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}', d) + syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}') if not syspath: return 'UNKNOWN' diff --git a/meta/conf/distro/include/tcmode-external-csl.inc b/meta/conf/distro/include/tcmode-external-csl.inc index 1ff808d9e..7bb845373 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): d = d.createCopy() d.finalize() - pattern = bb.data.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*', d) + pattern = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}*') files = glob(pattern) if not files: bb.fatal("Unable to populate toolchain binary symlinks") |