Replace bb.data.* with d.*

Used sed expression given here:

http://lists.linuxtogo.org/pipermail/openembedded-core/2011-November/012373.html

Plus an additional expression for .expand. Full expression is:

sed \
-e 's:bb.data.\(setVar([^,]*,[^,]*\), \([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,]*,[^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^, ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,]*,[^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,]*\), \([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(expand([^,]*\), \([^ )]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

Some minor correction in systemd.bbclass was needed for some expressions
that didn't quite match the regex in the desired way; additionally a few
instances were manually changed.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/meta-efl/recipes-efl/efl/edje-fpu.inc b/meta-efl/recipes-efl/efl/edje-fpu.inc
index dc39fa9c0..3f2aacffb 100644
--- a/meta-efl/recipes-efl/efl/edje-fpu.inc
+++ b/meta-efl/recipes-efl/efl/edje-fpu.inc
@@ -1,6 +1,6 @@
 
 def get_edje_fpu_setting(bb, d):
-    if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+    if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
         return "--enable-fixed-point"
     return ""
 
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
index cb1133490..4f8429187 100644
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc
@@ -19,7 +19,7 @@ EXTRA_OECONF = " \
 
 python populate_packages_prepend () {
     bb.note( "splitting packages for evas generic loaders" )
-    basedir = bb.data.expand( '${libdir}/evas/utils', d )
+    basedir = d.expand( '${libdir}/evas/utils')
 
     do_split_packages(d, basedir, '^evas_image_loader\.(.*)$',
     output_pattern = "evas-generic-loader-%s",
diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc
index e3e5d39cd..4f48f5d24 100644
--- a/meta-efl/recipes-efl/efl/evas.inc
+++ b/meta-efl/recipes-efl/efl/evas.inc
@@ -14,7 +14,7 @@ FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
 python populate_packages_prepend () {
     for plugin_type in "engines loaders savers".split():
         bb.note( "splitting packages for evas %s..." % plugin_type )
-        basedir = bb.data.expand( '${libdir}/evas/modules/%s' % plugin_type, d )
+        basedir = d.expand( '${libdir}/evas/modules/%s' % plugin_type)
 
         do_split_packages(d, basedir, '^(.*)',
         output_pattern = 'evas-' + plugin_type[:-1] + "-%s",
@@ -23,7 +23,7 @@ python populate_packages_prepend () {
         
         plugin_type = "cserve2"
         bb.note( "splitting packages for evas %s..." % plugin_type )
-        basedir = bb.data.expand( '${libdir}/evas/%s/loaders' % plugin_type, d )
+        basedir = d.expand( '${libdir}/evas/%s/loaders' % plugin_type)
 
         do_split_packages(d, basedir, '^(.*)',
         output_pattern = 'evas-' + plugin_type + "-%s",