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-devtools/perl-sanity | |
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-devtools/perl-sanity')
-rw-r--r-- | meta/recipes-devtools/perl-sanity/perl-ptest.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/perl-sanity/perl_5.28.1.bb | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/perl-sanity/perl-ptest.inc b/meta/recipes-devtools/perl-sanity/perl-ptest.inc index 597e5d841e..9dd9b7da57 100644 --- a/meta/recipes-devtools/perl-sanity/perl-ptest.inc +++ b/meta/recipes-devtools/perl-sanity/perl-ptest.inc | |||
@@ -46,7 +46,7 @@ python populate_packages_prepend() { | |||
46 | # do_split_packages requires a pair of () in the regex, but we have nothing | 46 | # do_split_packages requires a pair of () in the regex, but we have nothing |
47 | # to match, so use an empty pair. | 47 | # to match, so use an empty pair. |
48 | if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): | 48 | if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): |
49 | do_split_packages(d, d.expand('${libdir}/perl/${PV}'), '.*\.t()', | 49 | do_split_packages(d, d.expand('${libdir}/perl/${PV}'), r'.*\.t()', |
50 | '${PN}-ptest%s', '%s', recursive=True, match_path=True) | 50 | '${PN}-ptest%s', '%s', recursive=True, match_path=True) |
51 | } | 51 | } |
52 | 52 | ||
diff --git a/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb b/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb index 0df821d446..71892a2436 100644 --- a/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb +++ b/meta/recipes-devtools/perl-sanity/perl_5.28.1.bb | |||
@@ -222,12 +222,12 @@ PACKAGESPLITFUNCS_prepend = "split_perl_packages " | |||
222 | 222 | ||
223 | python split_perl_packages () { | 223 | python split_perl_packages () { |
224 | libdir = d.expand('${libdir}/perl5/${PV}') | 224 | libdir = d.expand('${libdir}/perl5/${PV}') |
225 | do_split_packages(d, libdir, '.*/auto/([^.]*)/[^/]*\.(so|ld|ix|al)', '${PN}-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False) | 225 | do_split_packages(d, libdir, r'.*/auto/([^.]*)/[^/]*\.(so|ld|ix|al)', '${PN}-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False) |
226 | do_split_packages(d, libdir, '.*linux/([^\/]*)\.pm', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 226 | do_split_packages(d, libdir, r'.*linux/([^\/]*)\.pm', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
227 | do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 227 | do_split_packages(d, libdir, r'Module/([^\/]*)\.pm', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
228 | do_split_packages(d, libdir, 'Module/([^\/]*)/.*', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 228 | do_split_packages(d, libdir, r'Module/([^\/]*)/.*', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
229 | do_split_packages(d, libdir, '.*linux/([^\/].*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 229 | do_split_packages(d, libdir, r'.*linux/([^\/].*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
230 | do_split_packages(d, libdir, '(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/)[^\/]).*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 230 | do_split_packages(d, libdir, r'(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/)[^\/]).*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
231 | 231 | ||
232 | # perl-modules should recommend every perl module, and only the | 232 | # perl-modules should recommend every perl module, and only the |
233 | # modules. Don't attempt to use the result of do_split_packages() as some | 233 | # modules. Don't attempt to use the result of do_split_packages() as some |