From patchwork Thu Jul 12 13:45:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 141827 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1538225ljj; Thu, 12 Jul 2018 06:46:00 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfgNwlX2c3DJ8RuF3Mf1u3yxz2km+UwdZzzUezYfmANTCZOLmVWwZkgRj07XI8E9E05GMW0 X-Received: by 2002:a17:902:c4:: with SMTP id a62-v6mr2253605pla.344.1531403159896; Thu, 12 Jul 2018 06:45:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531403159; cv=none; d=google.com; s=arc-20160816; b=ZVIm+fsiXtx96nlRm3Jzcp3glyv8FUDTvOxzx34j2Fj0MN7kFINXzBx3Uhm6o4OPLB jNgCLzQNUBxub7zk74eRrzsKwvD1Wwxfb0l5gpZRcV4Dg17GqphR6sRN6rIEg0xGBHu9 /VEJEaHQfywRuIrE3sC6Hw62Qeb8XRj8n+Akp+XO1onj24U3Ab+sSU5TA8fa/BiAcBJE s6v3FrmveQYT9M7iFG0V50LawWOw40cBxHBwk+erCzQ7PV2uTypwm8J8bCgm7/a5uVwL XrqPqNmepfLjJryvrLo0CwNtp3YKAHkb1zMd3oJAD61E7x5o5dClhR11y+CJTNjr4rg1 L53A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=NS7WYiGZpBvhTbn0YW/U68Tm73sVw/cpJBIqmxLWgDM=; b=oESJbJIm4zZt+CgO6jT4wdRUeYUZsU97VngPwCu4SZIeid2C4JL73iRu9GIVUqOoBJ HYjLeD96lbpBFrm/83k0DKf8z3JCybkYRj9gjLbj5Jzk/3Z+rWIB/o9Tiw2ZsQfnng17 M51Xt0Cha1GNorjt+Jawhb1Bg6qXvYRla3IKAPAoX/rYYmIaDAM/bO2Iqxr8dzKRU/ob nYIFigqlKIz8/UWEI37lMJdsBoDAzLFpcpAUkbDzyn4dYLyt88DbSgHoBp4bMexrSfy1 yoJE5+raLMYg79d2Xh+WGbd0aJViO4rXR1gClyXEancWRTeV2hdq8AWMhiSSYKEW1YEi hyuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=natiz67J; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y26-v6si10124512pfn.111.2018.07.12.06.45.59; Thu, 12 Jul 2018 06:45:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=natiz67J; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 654D875566; Thu, 12 Jul 2018 13:45:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by mail.openembedded.org (Postfix) with ESMTP id 24FC9754DA for ; Thu, 12 Jul 2018 13:45:53 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id x5-v6so18263545edr.0 for ; Thu, 12 Jul 2018 06:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=uyg5aYO1p8kB0heOKL2nMrKBDDEGHhcXETkM9zkZM9k=; b=natiz67J2JiXFnFhlns7+fT0VSYSu58Q5nAZwCmd+TDnSzp6H3g3Iu0KcuOY4dOpKx s6GaKtVlbMcx8YFl+dTu8USEWJaljhdQapH81pdR/roncSY4FWWBDzZLRz+oT181Tx4R A03KuoEB7TDXt1c7GQZr43KHnU1Rom5dacEGhVyHrpLNERZiGwNI9rmRPExE/jPAV67x OOvJw7AqO6LeilhiS2u3oxvOZHbQmYK/15haPngRSYJZKcOsW5M9krlx559NNkb/gFnE gntvJQj5xREda2UTDq1ugdsBKgK4IJ3WeyIQ2lbJ0Ni6qHKOviatW7TnmpEpSMrDWlj4 pzRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=uyg5aYO1p8kB0heOKL2nMrKBDDEGHhcXETkM9zkZM9k=; b=J698ZXJFAcqLnzyeFZK3aFKt9Fj4x25VBCpbHKLn+42QTcEUKaVdcyAPTr3xAV9Fyf 0XZ8eSf9vCP9HvQ6zJDmM21h3W27rlKDjKPv3AMWabQKmHA20xakYMxxgi/skYqDULki bSw+H5erNY1cK+3+MeW+bXqV7+oCqT92tuGOPTNTZJH4Ye7YsFVReg0ZOcdmg3EiZrxB oovV2yfEFW3bSymv7m9HM4nl/0Hwv9eAAhuEV9c/CdwENNA5OL+V3Kn/C27VLxj2jtu7 DRvYPSrkK9qzo8pam1pNAacOifDfD8tdsLfajDq7SlwHfPkijeAyrK3tLzD/lWJtiUja KZdg== X-Gm-Message-State: AOUpUlHQ0Wj81eWnrxFD9uu16taysD3Gny1TJD0jCzVL3Ni2231FWkgi AfBECsRPtdr96mUmOmrAoqySBC/Q X-Received: by 2002:a50:b5e6:: with SMTP id a93-v6mr2644062ede.94.1531403153519; Thu, 12 Jul 2018 06:45:53 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id d18-v6sm8985842eds.40.2018.07.12.06.45.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 06:45:52 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 12 Jul 2018 14:45:51 +0100 Message-Id: <20180712134551.27635-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] insane: optimise buildpath search X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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. Signed-off-by: Ross Burton --- meta/classes/insane.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 713b40eac42..469d5c4cd51 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -535,9 +535,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))