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-connectivity/connman | |
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-connectivity/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 35a7eed0a9..7fa9a7b93c 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -58,7 +58,7 @@ INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ." | |||
58 | 58 | ||
59 | python __anonymous () { | 59 | python __anonymous () { |
60 | systemd_packages = "${PN}" | 60 | systemd_packages = "${PN}" |
61 | pkgconfig = d.getVar('PACKAGECONFIG', True) | 61 | pkgconfig = d.getVar('PACKAGECONFIG') |
62 | if ('openvpn' or 'vpnc' or 'l2tp' or 'pptp') in pkgconfig.split(): | 62 | if ('openvpn' or 'vpnc' or 'l2tp' or 'pptp') in pkgconfig.split(): |
63 | systemd_packages += " ${PN}-vpn" | 63 | systemd_packages += " ${PN}-vpn" |
64 | d.setVar('SYSTEMD_PACKAGES', systemd_packages) | 64 | d.setVar('SYSTEMD_PACKAGES', systemd_packages) |
@@ -116,7 +116,7 @@ def add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, add_insane_skip): | |||
116 | 116 | ||
117 | python populate_packages_prepend() { | 117 | python populate_packages_prepend() { |
118 | depmap = dict(pppd="ppp") | 118 | depmap = dict(pppd="ppp") |
119 | multilib_prefix = (d.getVar("MLPREFIX", True) or "") | 119 | multilib_prefix = (d.getVar("MLPREFIX") or "") |
120 | 120 | ||
121 | hook = lambda file,pkg,x,y,z: \ | 121 | hook = lambda file,pkg,x,y,z: \ |
122 | add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, False) | 122 | add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, False) |