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/classes/package_tar.bbclass | |
parent | 8144d51511956a6e046e3976bb4c4a08f1a29c79 (diff) | |
download | openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.gz openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.bz2 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/classes/package_tar.bbclass')
-rw-r--r-- | meta/classes/package_tar.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index 7590177e4b..68b1bf0fed 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass @@ -4,7 +4,7 @@ IMAGE_PKGTYPE ?= "tar" python package_tar_fn () { fn = os.path.join(d.getVar('DEPLOY_DIR_TAR'), "%s-%s-%s.tar.gz" % (d.getVar('PKG'), d.getVar('PKGV'), d.getVar('PKGR'))) - fn = bb.data.expand(fn, d) + fn = d.expand(fn) d.setVar('PKGFN', fn) } @@ -68,7 +68,7 @@ python do_package_tar () { overrides = localdata.getVar('OVERRIDES') if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') - overrides = bb.data.expand(overrides, localdata) + overrides = localdata.expand(overrides) localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) bb.data.update_data(localdata) |