summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-25 13:26:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-07 15:10:33 +0100
commit53983505d78a797a3f339199f7306ed67742bdeb (patch)
treea8313ba6a3e91f04d0b10b250ac9c48fb9c92256 /meta
parent2f3579b7212b8a79fd2d96131608ab76f2ad1c2b (diff)
downloadpoky-53983505d78a797a3f339199f7306ed67742bdeb.tar.gz
libc_package/buildstats: Fix python regex quoting warnings
(From OE-Core rev: dd705fccfb35f9d3fee1452a5145d4e7ad24999d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 6a8077317ce12e13018ec4472f728dd24880bda9) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/libc-package.bbclass2
-rw-r--r--meta/lib/buildstats.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index de3b4250c7..1143f538d6 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -355,7 +355,7 @@ python package_do_split_gconvs () {
355 m.write("\t@echo 'Progress %d/%d'\n" % (i, total)) 355 m.write("\t@echo 'Progress %d/%d'\n" % (i, total))
356 m.write("\t" + makerecipe + "\n\n") 356 m.write("\t" + makerecipe + "\n\n")
357 d.setVar("EXTRA_OEMAKE", "-C %s ${PARALLEL_MAKE}" % (os.path.dirname(makefile))) 357 d.setVar("EXTRA_OEMAKE", "-C %s ${PARALLEL_MAKE}" % (os.path.dirname(makefile)))
358 d.setVarFlag("oe_runmake", "progress", "outof:Progress\s(\d+)/(\d+)") 358 d.setVarFlag("oe_runmake", "progress", r"outof:Progress\s(\d+)/(\d+)")
359 bb.note("Executing binary locale generation makefile") 359 bb.note("Executing binary locale generation makefile")
360 bb.build.exec_func("oe_runmake", d) 360 bb.build.exec_func("oe_runmake", d)
361 bb.note("collecting binary locales from locale tree") 361 bb.note("collecting binary locales from locale tree")
diff --git a/meta/lib/buildstats.py b/meta/lib/buildstats.py
index 8627ed3c31..c52b6c3b72 100644
--- a/meta/lib/buildstats.py
+++ b/meta/lib/buildstats.py
@@ -43,8 +43,8 @@ class SystemStats:
43 # depends on the heartbeat event, which fires less often. 43 # depends on the heartbeat event, which fires less often.
44 self.min_seconds = 1 44 self.min_seconds = 1
45 45
46 self.meminfo_regex = re.compile(b'^(MemTotal|MemFree|Buffers|Cached|SwapTotal|SwapFree):\s*(\d+)') 46 self.meminfo_regex = re.compile(rb'^(MemTotal|MemFree|Buffers|Cached|SwapTotal|SwapFree):\s*(\d+)')
47 self.diskstats_regex = re.compile(b'^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+.*)$') 47 self.diskstats_regex = re.compile(rb'^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+.*)$')
48 self.diskstats_ltime = None 48 self.diskstats_ltime = None
49 self.diskstats_data = None 49 self.diskstats_data = None
50 self.stat_ltimes = None 50 self.stat_ltimes = None