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>

4 files changed, 4 insertions, 4 deletions

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 603b38feef..0e2067a4e0 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -60,7 +60,7 @@ PACKAGES_DYNAMIC_virtclass-native = ""
 python populate_packages_prepend () {
         postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
 
-        loaders_root = bb.data.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders', d)
+        loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders')
 
         do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
 }
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index e45768d9da..66be75aee0 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -37,7 +37,7 @@ python populate_packages_prepend () {
         prologue = d.getVar("postinst_prologue", True)
         postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
 
-        gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+        gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}')
         loaders_root = os.path.join(gtk_libdir, 'loaders')
         immodules_root = os.path.join(gtk_libdir, 'immodules')
         printmodules_root = os.path.join(gtk_libdir, 'printbackends');
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 1e7a87f5d2..aee18c5880 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -37,7 +37,7 @@ python populate_packages_prepend () {
         prologue = d.getVar("postinst_prologue", True)
         postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
 
-        gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+        gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}')
         loaders_root = os.path.join(gtk_libdir, 'loaders')
         immodules_root = os.path.join(gtk_libdir, 'immodules')
         printmodules_root = os.path.join(gtk_libdir, 'printbackends');
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index c27826cedb..559c76ee6e 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -43,7 +43,7 @@ python populate_packages_prepend () {
 
         prologue = d.getVar("postinst_prologue", True)
 
-        gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+        gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}')
         immodules_root = os.path.join(gtk_libdir, 'immodules')
         printmodules_root = os.path.join(gtk_libdir, 'printbackends');