mirror of
https://git.yoctoproject.org/poky
synced 2026-07-27 19:37:10 +00:00
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>
This commit is contained in:
@@ -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")
|
||||
}
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user