diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-09 15:00:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 11:51:19 +0000 |
commit | c8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch) | |
tree | 5f1b86954646a0f3bb914407994388a6a4346769 /meta/recipes-core/tasks | |
parent | 5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff) | |
download | poky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/tasks')
-rw-r--r-- | meta/recipes-core/tasks/task-base.bb | 10 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-core-sdk.bb | 6 |
2 files changed, 8 insertions, 8 deletions
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 () { | |||
126 | 126 | ||
127 | import bb | 127 | import bb |
128 | 128 | ||
129 | distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split()) | 129 | distro_features = set(d.getVar("DISTRO_FEATURES", 1).split()) |
130 | machine_features= set(bb.data.getVar("MACHINE_FEATURES", d, 1).split()) | 130 | machine_features= set(d.getVar("MACHINE_FEATURES", 1).split()) |
131 | 131 | ||
132 | 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): | 132 | 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): |
133 | bb.data.setVar("ADD_BT", "task-base-bluetooth", d) | 133 | d.setVar("ADD_BT", "task-base-bluetooth") |
134 | 134 | ||
135 | 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): | 135 | 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): |
136 | bb.data.setVar("ADD_WIFI", "task-base-wifi", d) | 136 | d.setVar("ADD_WIFI", "task-base-wifi") |
137 | 137 | ||
138 | 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): | 138 | 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): |
139 | bb.data.setVar("ADD_3G", "task-base-3g", d) | 139 | d.setVar("ADD_3G", "task-base-3g") |
140 | } | 140 | } |
141 | 141 | ||
142 | # | 142 | # |
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 = "\ | |||
50 | 50 | ||
51 | #python generate_sdk_pkgs () { | 51 | #python generate_sdk_pkgs () { |
52 | # poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] | 52 | # poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] |
53 | # pkgs = bb.data.getVar('PACKAGES', d, 1).split() | 53 | # pkgs = d.getVar('PACKAGES', 1).split() |
54 | # for pkg in poky_pkgs.split(): | 54 | # for pkg in poky_pkgs.split(): |
55 | # newpkg = pkg.replace('task-core', 'task-core-sdk') | 55 | # newpkg = pkg.replace('task-core', 'task-core-sdk') |
56 | # | 56 | # |
@@ -79,9 +79,9 @@ RDEPENDS_task-core-sdk = "\ | |||
79 | # if packaged('%s-dev' % name, d): | 79 | # if packaged('%s-dev' % name, d): |
80 | # rreclist.append('%s-dev' % name) | 80 | # rreclist.append('%s-dev' % name) |
81 | # | 81 | # |
82 | # oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' | 82 | # oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg) or '' |
83 | # bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) | 83 | # bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) |
84 | # # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) | 84 | # # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS_%s' % newpkg))) |
85 | # | 85 | # |
86 | # # bb.note('pkgs is %s' % pkgs) | 86 | # # bb.note('pkgs is %s' % pkgs) |
87 | # bb.data.setVar('PACKAGES', ' '.join(pkgs), d) | 87 | # bb.data.setVar('PACKAGES', ' '.join(pkgs), d) |