diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-14 15:49:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-16 15:35:07 +0000 |
commit | cd4b8a8553f9d551af27941910cf4d3405ecb7b0 (patch) | |
tree | 4f2c58eca95fd5ea9a4538a66a4875fd9d947b0d /meta/recipes-connectivity | |
parent | 1ee53881eea3a7ca4d4f6a5ca9c4c6e6488d2348 (diff) | |
download | poky-cd4b8a8553f9d551af27941910cf4d3405ecb7b0.tar.gz |
meta: Fix Deprecated warnings from regexs
Fix handling of escape characters in regexs and hence fix python
Deprecation warnings which will be problematic in python 3.8.
Note that some show up as:
"""
meta/classes/package.bbclass:1293: DeprecationWarning: invalid escape sequence \.
"""
where the problem isn't on 1293 in package.bbclass but in some _prepend to a
package.bbclass function in a different file like mesa.inc, often from
do_package_split() calls.
(From OE-Core rev: 4b1c0c7d5525fc4cea9e0f02ec54e92a6fbc6199)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-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 0ba375137d..0a117e44a4 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -133,14 +133,14 @@ python populate_packages_prepend() { | |||
133 | add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, False) | 133 | add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, False) |
134 | plugin_dir = d.expand('${libdir}/connman/plugins/') | 134 | plugin_dir = d.expand('${libdir}/connman/plugins/') |
135 | plugin_name = d.expand('${PN}-plugin-%s') | 135 | plugin_name = d.expand('${PN}-plugin-%s') |
136 | do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, \ | 136 | do_split_packages(d, plugin_dir, r'^(.*).so$', plugin_name, \ |
137 | '${PN} plugin for %s', extra_depends='', hook=hook, prepend=True ) | 137 | '${PN} plugin for %s', extra_depends='', hook=hook, prepend=True ) |
138 | 138 | ||
139 | hook = lambda file,pkg,x,y,z: \ | 139 | hook = lambda file,pkg,x,y,z: \ |
140 | add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, True) | 140 | add_rdepends(bb, d, file, pkg, depmap, multilib_prefix, True) |
141 | plugin_dir = d.expand('${libdir}/connman/plugins-vpn/') | 141 | plugin_dir = d.expand('${libdir}/connman/plugins-vpn/') |
142 | plugin_name = d.expand('${PN}-plugin-vpn-%s') | 142 | plugin_name = d.expand('${PN}-plugin-vpn-%s') |
143 | do_split_packages(d, plugin_dir, '^(.*).so$', plugin_name, \ | 143 | do_split_packages(d, plugin_dir, r'^(.*).so$', plugin_name, \ |
144 | '${PN} VPN plugin for %s', extra_depends='', hook=hook, prepend=True ) | 144 | '${PN} VPN plugin for %s', extra_depends='', hook=hook, prepend=True ) |
145 | } | 145 | } |
146 | 146 | ||