diff options
-rw-r--r-- | meta/classes/libc-package.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/buildstats.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 7a661d44bd..13ef8cdc0d 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 |