From patchwork Mon Dec 9 12:20:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 181022 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4273372ile; Mon, 9 Dec 2019 04:20:46 -0800 (PST) X-Google-Smtp-Source: APXvYqzKOrCbz29P6Jm55FfCJmHT5FJqBuVoUQRzzQ6JXKTFN6eURZWDBWx2IENVq40BrBd/rcFc X-Received: by 2002:a63:770c:: with SMTP id s12mr19016102pgc.25.1575894046143; Mon, 09 Dec 2019 04:20:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575894046; cv=none; d=google.com; s=arc-20160816; b=byebli+MT60RY9EGnA1OFyLObTJVai2zg81+X+r/TAytJN77jjXO/olWLsJhXxSNOR 9E96lrDaXBhFpm588bJauJK8u8ORFPjvGOt4Bzt4AyAYYdTFG2DNhcNU7YwYWAwOHcWI pLxLc6Nd3dPBfwSN5xQC1tZlisAv+StrS9bWxNZt6/qO5Iblc9YeJ69o5WdapUilytTv Y2OuCpor7DpAP/NVJSaF4nqw/d+x0/ay5180vqclDFd5szobX0xpmR4R0/9zBkM/6qYW s9KOrLhZYxMR+J7210xKuDqCOo7OwSAk0PQ8DGQmELLNePhm/7gebXLBtFxG16gkns14 LCQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=lfojIPtSBVkBDl83zPqR4mvW3LUkvJKkHRW5lq2ITdY=; b=ddCjDZYiBCuUF74y66KZqdNtf1HtwbaUZa6BmgvHZa1j53jAFcbCsyzgcSG1UYdvXo o1IdOdbXLe8Z1FRkqqvkh7xM/oz2RuB70sGrgip1tqN3TOJzutYfnQI42m2264qrcOgd X2zjhVuc2fmNEXUgv9bS9atkX5kFyiun6027sLFTLqHXvwdxj38Pd4ol26TPHakz6ceL CfSVwxXnTZXE+TaHNLflT/9B/T3EbBX8aMyljo4k8cUVWAOjyyEa+xPvFfn3bidgILCN DOjo+aMcJrXY7iSvwS6DQvLeVwOGVWvCwq+juZJwJIFJxeFRTjf8mbyLjY6ebriraaZU XDRg== 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=Q0gkYaJ4; 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 v8si8193509pgq.432.2019.12.09.04.20.45; Mon, 09 Dec 2019 04:20:46 -0800 (PST) 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=Q0gkYaJ4; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0A5AA7FD05; Mon, 9 Dec 2019 12:20:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 6BF757FCF3 for ; Mon, 9 Dec 2019 12:20:17 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id j42so15902410wrj.12 for ; Mon, 09 Dec 2019 04:20:18 -0800 (PST) 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:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZLoABNFiMIlJlrgebsJ0KHBlYO2pNKFElpeyyVt1UXI=; b=Q0gkYaJ4GglLZmmCkV8Ug22YDWkdXsBzq/W459KaVvUg7NGs7evkhnM6ZYOwWUNGr5 2QErEsIXW8hGMX8mqmF2N3IokM4/Avz7aNOuwd1feBgKomG+kr+n8py7aqV7DIxdQhnX KPd0AgUxLrVkyvVwldYGjF5bYJFAgrdh0+BNvs/CYhUeenXr2U+ervp4E7NSs3Y8qSL9 9scdrAoSuoWXweFuxxuwCI7Z/OeJM3nLRdstzGK4TwDM5lo5CnUI9nKMFs0osfAYNq8u OSU1JmJQ4apMCYCqWdp2qKVlsXiC23fTy3v4MuS7ExcNYk7Je1yu80YqqCdLGk59bgun Jd7A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZLoABNFiMIlJlrgebsJ0KHBlYO2pNKFElpeyyVt1UXI=; b=KkgCy1hFC6zbAFhoxboGw8ujSNQuoV8R9OFcWT47UYOcxLqjA5l/O9H1XIaDISri7K mjtUqDgDrbfpwg73yPswIfgaO6vFl4bg804lTCWOhBk8T+9jHmEDb3fI9VASyt+ZYIJB PTWWIjBiUSWTCyHRVLq0CmLrgFTOP6/v/YlwPBJmrHYZ781aSVORQzUnV5c38g3YxGJ2 4/gOhowrJIUj1kdrMUyRqaWVolErLfNuWd+5e7EL1gr5oBuRc0Lt5fWg2UjPIvfyWi0B BIQJWiIItk9UHFvgG/g59BuVrPwnvbcNdXgofgqnkajiA/SatCBREuhkqZrla5nlVyXv uhwQ== X-Gm-Message-State: APjAAAWqcQl92rKH/LMcvNZe7fFfsdoJsHbOh7ftKOS1g3gC0YAX47i5 mckrimYhzs5XjJT0W1l/jicW15JlylM= X-Received: by 2002:adf:fbc1:: with SMTP id d1mr1903416wrs.267.1575894017996; Mon, 09 Dec 2019 04:20:17 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id a3sm14611177wmh.5.2019.12.09.04.20.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 04:20:17 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 9 Dec 2019 12:20:07 +0000 Message-Id: <20191209122007.13306-4-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191209122007.13306-1-ross.burton@intel.com> References: <20191209122007.13306-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 4/4] insane: don't use cachedpath 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Unless cachedpath is used correctly then it's just a glorified clone of os.walk, but without any of the recent optimisations in os.walk. In this codepath there is no point to using cachedpath. Signed-off-by: Ross Burton --- meta/classes/insane.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.20.1 -- _______________________________________________ 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 0564f9c2a41..723348fc8e7 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -937,14 +937,13 @@ python do_package_qa () { pkgdest = d.getVar('PKGDEST') packages = set((d.getVar('PACKAGES') or '').split()) - cpath = oe.cachedpath.CachedPath() global pkgfiles pkgfiles = {} for pkg in packages: pkgfiles[pkg] = [] - for walkroot, dirs, files in cpath.walk(pkgdest + "/" + pkg): + for walkroot, dirs, files in os.walk(os.path.join(pkgdest, pkg)): for file in files: - pkgfiles[pkg].append(walkroot + os.sep + file) + pkgfiles[pkg].append(os.path.join(walkroot, file)) # no packages should be scanned if not packages: