diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-core/packagegroups | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/packagegroups')
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 2e94fdefb5..0069e3e0f7 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -110,8 +110,8 @@ python __anonymous () { | |||
110 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) | 110 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) |
111 | # then include packagegroup-base-wifi in packagegroup-base | 111 | # then include packagegroup-base-wifi in packagegroup-base |
112 | 112 | ||
113 | distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) | 113 | distro_features = set(d.getVar("DISTRO_FEATURES").split()) |
114 | machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) | 114 | machine_features= set(d.getVar("MACHINE_FEATURES").split()) |
115 | 115 | ||
116 | 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): | 116 | 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): |
117 | d.setVar("ADD_BT", "packagegroup-base-bluetooth") | 117 | d.setVar("ADD_BT", "packagegroup-base-bluetooth") |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index 327cd8e865..7d6d41473a 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | |||
@@ -42,7 +42,7 @@ RRECOMMENDS_packagegroup-core-sdk = "\ | |||
42 | 42 | ||
43 | #python generate_sdk_pkgs () { | 43 | #python generate_sdk_pkgs () { |
44 | # poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES'] | 44 | # poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES'] |
45 | # pkgs = d.getVar('PACKAGES', True).split() | 45 | # pkgs = d.getVar('PACKAGES').split() |
46 | # for pkg in poky_pkgs.split(): | 46 | # for pkg in poky_pkgs.split(): |
47 | # newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk') | 47 | # newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk') |
48 | # | 48 | # |