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>

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)