From c8dee9b92dfd545852ecac8dc2adfc95ac02e957 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 9 Nov 2011 15:00:01 +0000
Subject: 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>
---
 meta/recipes-graphics/cairo/cairo-fpu.inc                   | 2 +-
 meta/recipes-graphics/clutter/clutter-fpu.inc               | 2 +-
 meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb | 2 +-
 meta/recipes-graphics/mesa/mesa-dri.inc                     | 2 +-
 meta/recipes-graphics/pango/pango.inc                       | 2 +-
 meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb              | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'meta/recipes-graphics')

diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc b/meta/recipes-graphics/cairo/cairo-fpu.inc
index bdaf789799..8c0ecfde94 100644
--- a/meta/recipes-graphics/cairo/cairo-fpu.inc
+++ b/meta/recipes-graphics/cairo/cairo-fpu.inc
@@ -1,6 +1,6 @@
 
 def get_cairo_fpu_setting(bb, d):
-	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+	if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
 		return "--disable-some-floating-point"
 	return ""
 
diff --git a/meta/recipes-graphics/clutter/clutter-fpu.inc b/meta/recipes-graphics/clutter/clutter-fpu.inc
index 21a16feac2..dfa933de5c 100644
--- a/meta/recipes-graphics/clutter/clutter-fpu.inc
+++ b/meta/recipes-graphics/clutter/clutter-fpu.inc
@@ -1,6 +1,6 @@
 
 def get_clutter_fpu_setting(bb, d):
-	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+	if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
 		return "--without-fpu"
 	return ""
 
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
index 03a1bc86c2..0e213909e3 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
@@ -3,7 +3,7 @@ inherit native
 DEPENDS = "freetype-native expat-native zlib-native"
 
 EXTRA_OEMAKE = ""
-EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % d.getVar('STAGING_BINDIR', 1)][os.path.isfile('%s/freetype-config' % d.getVar('STAGING_BINDIR', 1))]}"
 
 do_install_append () {
 	install -d ${D}${bindir}/
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index fcce25996d..3687648999 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -13,7 +13,7 @@ EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gal
 python populate_packages_prepend() {
 	import os.path
 
-	dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+	dri_drivers_root = os.path.join(d.getVar('libdir', 1), "dri")
 
 	do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
 }
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index a8e99e2f6d..6d94e02878 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -39,7 +39,7 @@ fi
 }
 
 python populate_packages_prepend () {
-	prologue = bb.data.getVar("postinst_prologue", d, 1)
+	prologue = d.getVar("postinst_prologue", 1)
 
 	modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d)
 
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
index 0fb10e6af0..0f9a1b3c9b 100644
--- a/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxft_2.2.0.bb
@@ -26,8 +26,8 @@ XORG_PN = "libXft"
 BBCLASSEXTEND = "native nativesdk"
 
 python () {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', '${MLPREFIX}libxft2', d)
+        if d.getVar('DEBIAN_NAMES', 1):
+            d.setVar('PKG_${PN}', '${MLPREFIX}libxft2')
 }
 
 FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-- 
cgit v1.2.3-54-g00ecf