From b22831fd63164c4db9c0b72934d7d734a6585251 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 *` Signed-off-by: Richard Purdie --- meta/recipes-core/tasks/task-base.bb | 10 +++++----- meta/recipes-core/tasks/task-core-sdk.bb | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta/recipes-core/tasks') diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb index 99b7e17a69..e0960b5e0e 100644 --- a/meta/recipes-core/tasks/task-base.bb +++ b/meta/recipes-core/tasks/task-base.bb @@ -126,17 +126,17 @@ python __anonymous () { import bb - distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split()) - machine_features= set(bb.data.getVar("MACHINE_FEATURES", d, 1).split()) + distro_features = set(d.getVar("DISTRO_FEATURES", 1).split()) + machine_features= set(d.getVar("MACHINE_FEATURES", 1).split()) if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): - bb.data.setVar("ADD_BT", "task-base-bluetooth", d) + d.setVar("ADD_BT", "task-base-bluetooth") if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): - bb.data.setVar("ADD_WIFI", "task-base-wifi", d) + d.setVar("ADD_WIFI", "task-base-wifi") if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): - bb.data.setVar("ADD_3G", "task-base-3g", d) + d.setVar("ADD_3G", "task-base-3g") } # diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb index 5743631787..a74de01b07 100644 --- a/meta/recipes-core/tasks/task-core-sdk.bb +++ b/meta/recipes-core/tasks/task-core-sdk.bb @@ -50,7 +50,7 @@ RDEPENDS_task-core-sdk = "\ #python generate_sdk_pkgs () { # poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] -# pkgs = bb.data.getVar('PACKAGES', d, 1).split() +# pkgs = d.getVar('PACKAGES', 1).split() # for pkg in poky_pkgs.split(): # newpkg = pkg.replace('task-core', 'task-core-sdk') # @@ -79,9 +79,9 @@ RDEPENDS_task-core-sdk = "\ # if packaged('%s-dev' % name, d): # rreclist.append('%s-dev' % name) # -# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' +# oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg) or '' # bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) -# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) +# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS_%s' % newpkg))) # # # bb.note('pkgs is %s' % pkgs) # bb.data.setVar('PACKAGES', ' '.join(pkgs), d) -- cgit v1.2.3