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-oe/recipes-core/meta/distro-feed-configs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-core/meta') diff --git a/meta-oe/recipes-core/meta/distro-feed-configs.bb b/meta-oe/recipes-core/meta/distro-feed-configs.bb index a25ef8f70c..cff0946da6 100644 --- a/meta-oe/recipes-core/meta/distro-feed-configs.bb +++ b/meta-oe/recipes-core/meta/distro-feed-configs.bb @@ -21,8 +21,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" #def distro_feed_configs(d): # import bb -# parchs = bb.data.getVar( "PACKAGE_EXTRA_ARCHS", d, 1 ).split() -# march = bb.data.getVar( "MACHINE_ARCH", d, 1 ).split() +# parchs = d.getVar( "PACKAGE_EXTRA_ARCHS", 1 ).split() +# march = d.getVar( "MACHINE_ARCH", 1 ).split() # archs = [ "all" ] + parchs + march # confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ] # return " ".join( confs ) -- cgit v1.2.3-54-g00ecf