From 065dab7480ea0fae66db4b5a01d09814b1f38e03 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 11:21:22 +0000 Subject: 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 --- meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +- meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-gnome/gtk+') diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb index e45768d9d..66be75aee 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 1e7a87f5d..aee18c588 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 07c0bfd62..2cc3a0357 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'); -- cgit v1.2.3