From 3a30c562385cb3d9cd1b3043f6fe677a22024018 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 28 Oct 2012 13:49:59 +0000 Subject: 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 --- meta-gnome/recipes-support/goffice/goffice_0.8.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-gnome/recipes-support') diff --git a/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb b/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb index 4b6473149a..c5d54ab1c8 100644 --- a/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb +++ b/meta-gnome/recipes-support/goffice/goffice_0.8.17.bb @@ -39,7 +39,7 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} PACKAGES_DYNAMIC += "^goffice-plugin-.*" python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins/', d) + goffice_libdir = d.expand('${libdir}/goffice/${PV}/plugins/') do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) } -- cgit v1.2.3-54-g00ecf