summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-14 15:49:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-16 15:35:07 +0000
commitcd4b8a8553f9d551af27941910cf4d3405ecb7b0 (patch)
tree4f2c58eca95fd5ea9a4538a66a4875fd9d947b0d /meta/recipes-graphics/mesa
parent1ee53881eea3a7ca4d4f6a5ca9c4c6e6488d2348 (diff)
downloadpoky-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-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 0cc0a82de4..06c47e6dd4 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -194,7 +194,7 @@ python mesa_populate_packages() {
194 dri_pkgs = os.listdir(dri_drivers_root) 194 dri_pkgs = os.listdir(dri_drivers_root)
195 lib_name = d.expand("${MLPREFIX}mesa-megadriver") 195 lib_name = d.expand("${MLPREFIX}mesa-megadriver")
196 for p in dri_pkgs: 196 for p in dri_pkgs:
197 m = re.match('^(.*)_dri\.so$', p) 197 m = re.match(r'^(.*)_dri\.so$', p)
198 if m: 198 if m:
199 pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) 199 pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1))
200 d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) 200 d.appendVar("RPROVIDES_%s" % lib_name, pkg_name)
@@ -202,7 +202,7 @@ python mesa_populate_packages() {
202 d.appendVar("RREPLACES_%s" % lib_name, pkg_name) 202 d.appendVar("RREPLACES_%s" % lib_name, pkg_name)
203 203
204 pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe") 204 pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe")
205 do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') 205 do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
206} 206}
207 207
208PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " 208PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "