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 | |
| 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')
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index ecefb7b593..55a5055ff3 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
| @@ -95,13 +95,13 @@ FILES_${PN}-testtools = "${libdir}/bluez/test/*" | |||
| 95 | 95 | ||
| 96 | def get_noinst_tools_paths (d, bb, tools): | 96 | def get_noinst_tools_paths (d, bb, tools): |
| 97 | s = list() | 97 | s = list() |
| 98 | bindir = d.getVar("bindir", True) | 98 | bindir = d.getVar("bindir") |
| 99 | for bdp in tools.split(): | 99 | for bdp in tools.split(): |
| 100 | f = os.path.basename(bdp) | 100 | f = os.path.basename(bdp) |
| 101 | s.append("%s/%s" % (bindir, f)) | 101 | s.append("%s/%s" % (bindir, f)) |
| 102 | return "\n".join(s) | 102 | return "\n".join(s) |
| 103 | 103 | ||
| 104 | FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}" | 104 | FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS'))}" |
| 105 | 105 | ||
| 106 | RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject" | 106 | RDEPENDS_${PN}-testtools += "python3 python3-dbus python3-pygobject" |
| 107 | 107 | ||
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) |
