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-extended/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-extended/packagegroups')
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 2 | ||||
-rw-r--r-- | meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb index a60a68cbf2..d8975f2157 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | |||
@@ -31,7 +31,7 @@ python __anonymous () { | |||
31 | namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts" | 31 | namemap["packagegroup-core-full-cmdline-initscripts"] = "packagegroup-core-initscripts" |
32 | namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" | 32 | namemap["packagegroup-core-full-cmdline-sys-services"] = "packagegroup-core-sys-services" |
33 | 33 | ||
34 | packages = d.getVar("PACKAGES", True).split() | 34 | packages = d.getVar("PACKAGES").split() |
35 | for pkg in packages: | 35 | for pkg in packages: |
36 | if pkg.endswith('-dev'): | 36 | if pkg.endswith('-dev'): |
37 | mapped = namemap.get(pkg[:-4], None) | 37 | mapped = namemap.get(pkg[:-4], None) |
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 29564e0c9d..734dda1d79 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | |||
@@ -15,9 +15,9 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
15 | # We will skip parsing this packagegeoup for non-glibc systems | 15 | # We will skip parsing this packagegeoup for non-glibc systems |
16 | # | 16 | # |
17 | python __anonymous () { | 17 | python __anonymous () { |
18 | if d.getVar('TCLIBC', True) != "glibc": | 18 | if d.getVar('TCLIBC') != "glibc": |
19 | raise bb.parse.SkipPackage("incompatible with %s C library" % | 19 | raise bb.parse.SkipPackage("incompatible with %s C library" % |
20 | d.getVar('TCLIBC', True)) | 20 | d.getVar('TCLIBC')) |
21 | } | 21 | } |
22 | 22 | ||
23 | PACKAGES = "\ | 23 | PACKAGES = "\ |