summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-25 12:26:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-26 15:35:00 (GMT)
commitc4f0ccb5612eb31bb0538673bbf98c3abe28c2cb (patch)
treee5c73f9da2ee49d4a202fba6d4c259ebbf4ca520
parent694a1ae8f81ed8c6d93e541918465a0d2b5277ed (diff)
downloadpoky-c4f0ccb5612eb31bb0538673bbf98c3abe28c2cb.tar.gz
libc_package/buildstats: Fix python regex quoting warnings
(From OE-Core rev: 6a8077317ce12e13018ec4472f728dd24880bda9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 7a661d4..13ef8cd 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 8627ed3..c52b6c3 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