From c8dee9b92dfd545852ecac8dc2adfc95ac02e957 Mon Sep 17 00:00:00 2001 From: Richard Purdie 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 --- meta/recipes-sato/puzzles/oh-puzzles_git.bb | 4 ++-- meta/recipes-sato/puzzles/puzzles_r9306.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-sato/puzzles') diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb index 6d95d79e8c..c2e7622245 100644 --- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb +++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb @@ -61,10 +61,10 @@ FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas" python __anonymous () { import bb var = bb.data.expand("FILES_${PN}", d, 1) - data = bb.data.getVar(var, d, 1) + data = d.getVar(var, 1) for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"): data = data + " /usr/games/%s" % name data = data + " /usr/share/applications/%s.desktop" % name data = data + " /etc/gconf/schemas/%s.schemas" % name - bb.data.setVar(var, data, d) + d.setVar(var, data) } diff --git a/meta/recipes-sato/puzzles/puzzles_r9306.bb b/meta/recipes-sato/puzzles/puzzles_r9306.bb index ee0c02537a..c3849309ad 100644 --- a/meta/recipes-sato/puzzles/puzzles_r9306.bb +++ b/meta/recipes-sato/puzzles/puzzles_r9306.bb @@ -3,7 +3,7 @@ HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" DEPENDS = "gtk+ libxt" PR = "r0" -MOD_PV = "${@bb.data.getVar('PV',d,1)[1:]}" +MOD_PV = "${@d.getVar('PV',1)[1:]}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=9928b60f3b78be315b7ab699c1b03ff5" -- cgit v1.2.3-54-g00ecf