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/task-base.bb | |
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/task-base.bb')
-rw-r--r-- | meta/recipes-core/tasks/task-base.bb | 10 |
1 files changed, 5 insertions, 5 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 | # |