Convert to use direct access to the data store (instead of bb.data.*Var*())

This is the result of running the following over the metadata:

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' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/meta/classes/packagedata.bbclass b/meta/classes/packagedata.bbclass
index bf051feea8..9c7aede3bb 100644
--- a/meta/classes/packagedata.bbclass
+++ b/meta/classes/packagedata.bbclass
@@ -1,13 +1,13 @@
 python read_subpackage_metadata () {
         import oe.packagedata
 
-        data = oe.packagedata.read_pkgdata(bb.data.getVar('PN', d, 1), d)
+        data = oe.packagedata.read_pkgdata(d.getVar('PN', 1), d)
 
         for key in data.keys():
-                bb.data.setVar(key, data[key], d)
+                d.setVar(key, data[key])
 
-        for pkg in bb.data.getVar('PACKAGES', d, 1).split():
+        for pkg in d.getVar('PACKAGES', 1).split():
                 sdata = oe.packagedata.read_subpkgdata(pkg, d)
                 for key in sdata.keys():
-                        bb.data.setVar(key, sdata[key], d)
+                        d.setVar(key, sdata[key])
 }