From 884b88356259dfc3ec464adb1a8c6dda2ac4cf42 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 12 Jul 2018 14:44:06 +0100 Subject: insane: optimise buildpath search Instead of decoding every file we open as UTF-8 (with many errors as machine code isn't UTF-8), convert the build path to the UTF-8 byte representation and search for that instead. (From OE-Core rev: ffb52d383bfe413cf31fef13663fe9937a146c76) (From OE-Core rev: e0e366731116e62857fa3bdec9e3897aafcc8137) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index fa15460842..eb2d96711e 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -534,9 +534,9 @@ def package_qa_check_buildpaths(path, name, d, elf, messages): if path.find(name + "/CONTROL/") != -1 or path.find(name + "/DEBIAN/") != -1: return - tmpdir = d.getVar('TMPDIR') + tmpdir = bytes(d.getVar('TMPDIR'), encoding="utf-8") with open(path, 'rb') as f: - file_content = f.read().decode('utf-8', errors='ignore') + file_content = f.read() if tmpdir in file_content: package_qa_add_message(messages, "buildpaths", "File %s in package contained reference to tmpdir" % package_qa_clean_path(path,d)) -- cgit v1.2.3-54-g00ecf