From patchwork Mon Dec 9 12:20:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 181019 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4272872ile; Mon, 9 Dec 2019 04:20:19 -0800 (PST) X-Google-Smtp-Source: APXvYqz85ieIpjY2QprtHE5TtFRg40Zwja9bJbloWG58QQhUtSjHNbsJnEQCPvlhnvvwHDUELrY/ X-Received: by 2002:a63:3245:: with SMTP id y66mr18401741pgy.234.1575894019789; Mon, 09 Dec 2019 04:20:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575894019; cv=none; d=google.com; s=arc-20160816; b=ys69Kvr/OYMSuEb9yvpbumsitqpb52k1h7r8xw3e2bf9MqkhhTwXQWFoYE5CkGFQ9q q8x1jSI928zd/cD8h8Z5unK37X5i7iY0vuUcu+S/985ZPeR47mIc8Fv69ie2YWXFhV3Y 0ZoGRtJDvHX8vE/ShgAfAN/2p7B3Les8CUqfqKkxpa7Nqo3GFgvSDrTN0Z4S2d3zguzM vQ8Btu1fBjxvT516XGMWb3WhbNrZcqctXZb5ddnUn2174MCvyy+kQZ8DIgcBmI4skONQ RGOEQkSF7pn6LHsycL62JgDJLxD+z84gb6nj6R/5i1KLRttxjfPv/wvgszar+4sGyY5S lc7Q== 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:message-id:date:to:from:dkim-signature:delivered-to; bh=dOl440Met8YncB+S1JHOX0hHzsG3LPV009Q0nWLfiIc=; b=cNqxcF0HhEfY+hb5y78UAJcEbYpV3q2Qkn3C6r7DU0HIf8qTN+YTgZc5e5P8XB7aQ/ HJUnjTonwfBc58j496riVotv0AULFygGF03WmIrrHm7R8ewFHse0Frz+iIvvv69hJxc0 ju7YNwaa0beNdoWj1LoNHqQdgwwAvKYB8JLdqgTkoHCWtLqEiPxmtGeAJuvWxbThWMYQ +MK051P9XwiwK2PFgzQNa/gc+ujXXUtwKVgDFuk15xXjhwB6LX3uh50eAzHqxeCExC+S o9dhlqVwWxFAnO7/3HQueVnd5WCxIReavBK/sRPiDpnI4F7CNtXb4zG6fj4lef+oO4uu YFGg== 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=Xvah80Hl; 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 a14si18803621pgk.542.2019.12.09.04.20.18; Mon, 09 Dec 2019 04:20:19 -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=Xvah80Hl; 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 571D67FCF2; Mon, 9 Dec 2019 12:20:15 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mail.openembedded.org (Postfix) with ESMTP id 832FE6B07F for ; Mon, 9 Dec 2019 12:20:14 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id c14so15948865wrn.7 for ; Mon, 09 Dec 2019 04:20:15 -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:mime-version :content-transfer-encoding; bh=ocBemKmEMkZhU6Cq042ESzkRVAM9JItad2X1c25Ob9U=; b=Xvah80HlYhzd244mREHEc1HjLn/Nd6XWj0JX2YuwJGYfFG5PYWCxXTbXLgW3xueuP3 rXipQjgwB83cCUyrs1ZiwwEZJFjX3uJGL57M0tqJHSdS05k5wytj8vbW+rxtWQ/cLqFS E44mRX61nfEeV0Oom2R9c55sSz/SXoSpiQp827W0Zmk/pOFQ+nv8btdbRF/KbZEHHjD+ cTTzwnE8/qWDd+6rswDzE1qwSU0HCNkFsUZ9KrLot0RHctHmeQIgtB2pUcxqWwXxuTJF LN3QMOvrULS7t38Nl0pPUarFj4EBIk+HV1m/wq5Gdo9owYXSNHIRwhylXlylqKoUVTK3 k0Tg== 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:mime-version :content-transfer-encoding; bh=ocBemKmEMkZhU6Cq042ESzkRVAM9JItad2X1c25Ob9U=; b=ZfQxOtI5NtBiE4+FBsDoGlLU2jWFRiJVTSyEGy5SQOcbUFGRDZQj6myIyM618/YPK0 vth1wfBgWYo7r1UqB3uqfU0Pe914FI7W0T+PR8akJrRz5TtYnYhx8XS6JkN63xiz29N6 v22Y474X00oT4d5iR9/GlKEnWRYRrskVj/0NUsGG3+k5k6wpIJoCvLmqSUO2fSjpEJAo a6npQfBUp6RUm1JYwYZZoKYon7rExK7+v1pW/dzvSDFPBQb0LYxjwVFnqzlIOgoM6CNH BWF3zo5jTLK7BMgeQOLII+esi9Eym2QdV1oQqC/gge/pTk6uu4nXA5DazKLxHm4nz8xg VCxA== X-Gm-Message-State: APjAAAV+1UyWfTum34XXqiNfHIlt5op+tvu0JV2DHy7LJg03M6IQXWL9 8FmP8dKoBg9LicMrgt8Xn8Wzs2hPfZM= X-Received: by 2002:adf:9427:: with SMTP id 36mr1904613wrq.166.1575894014891; Mon, 09 Dec 2019 04:20:14 -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.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 04:20:13 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 9 Dec 2019 12:20:04 +0000 Message-Id: <20191209122007.13306-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/4] selftest-hardlink: don't RDEPEND on gdb explicitly 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 For easy of reuse and speed of building, don't RDEPEND on gdb explicitly. Instead put gdb.sh into ${PN} and explicitly install gdb into the image if needed. This means other tests that don't need to use gdb can reuse this recipe without waiting for a target gdb to build. Signed-off-by: Ross Burton --- .../recipes-test/selftest-hardlink/selftest-hardlink.bb | 4 ---- meta/lib/oeqa/selftest/cases/package.py | 2 +- 2 files changed, 1 insertion(+), 5 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-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb index 842a9772cbe..8b336a04c9f 100644 --- a/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb +++ b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb @@ -24,7 +24,3 @@ do_install () { dd if=/dev/zero of=${D}${bindir}/sparsetest bs=1 count=0 seek=1M } - -RDEPENDS_${PN}-gdb += "gdb" -PACKAGES =+ "${PN}-gdb" -FILES_${PN}-gdb = "${bindir}/gdb.sh" diff --git a/meta/lib/oeqa/selftest/cases/package.py b/meta/lib/oeqa/selftest/cases/package.py index b87f8dc3e2c..c6444062674 100644 --- a/meta/lib/oeqa/selftest/cases/package.py +++ b/meta/lib/oeqa/selftest/cases/package.py @@ -118,7 +118,7 @@ class PackageTests(OESelftestTestCase): def test_gdb_hardlink_debug(self): features = 'IMAGE_INSTALL_append = " selftest-hardlink"\n' features += 'IMAGE_INSTALL_append = " selftest-hardlink-dbg"\n' - features += 'IMAGE_INSTALL_append = " selftest-hardlink-gdb"\n' + features += 'IMAGE_INSTALL_append = " gdb"\n' self.write_config(features) bitbake("core-image-minimal") From patchwork Mon Dec 9 12:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 181020 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4273110ile; Mon, 9 Dec 2019 04:20:33 -0800 (PST) X-Google-Smtp-Source: APXvYqwM12gR9pmNOSpEZS7I+3DZNBkaghTsBGlkV3l6FteLBbSxb/dWXc5fZA/u/OR45EmH2MnF X-Received: by 2002:a17:90a:8c0b:: with SMTP id a11mr2429107pjo.104.1575894033068; Mon, 09 Dec 2019 04:20:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575894033; cv=none; d=google.com; s=arc-20160816; b=HR9qrAN6yxmLW1pT9wOE98vgJZZW0trj4uhLzc5wulqH21yaq0gmy+QEMT9UDU2XaF 3fZiSzJDEPaBRX6+2pISixMfFZ9IuXfh8vwFGy8lyPwIuyzMHKozChrimia8rtgdhc6s Zkt5B2BLnmguGhqHIwU6rtPjkBc7rnCuG4ejC6R3oN+ScaQwDUO4Os10uZbM/pLHQigI Gnh4JvKVsQq7h4E+qPgtncxp2GT1+JatYNaJGNjCL2aLug+QP83NrqrMQmYHkl5R8b/7 +iBzcTQm1uSMu6wyavyQ51TbAGHOAk1PKNCxM3DAZWtjZtzw/QHFgySd6c+D60rRS7+G d9eg== 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=rl3INbuNu3UayEAKT25IkLRTtRC7NNymDUtQAS02vYk=; b=NqlmG0Mnnoz7wCWgICc6ADe96obiZdD8U8MZHQPzKFEMaFQovCPU7EUDp6asUPM9cS CGOFJCt+4bjju3tgALFRXPymdf5s51ElWOu8Xjo+NonL+KdCEeRg9Fed/L75G8aKdJX/ srT7LQdps2pvTHkBSoMhcsjTcHnUKr43p7jng4ahuSK63o5E3me94P0uMbnrPptzjR2O BwLr786xYBidPAN1rqOEwOiGIX+QaPvXp5FKTl1sEgX1np8h/mDWOI5LMepUj8xn/glQ WhyExZMqVcsmB9gA4X4PQ6coixup68E1qr3vvKXMTSBIdDHCK0kVTm/E81x/5kg7s5j9 7o1A== 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="y//BGlnh"; 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 y141si5337289pfc.212.2019.12.09.04.20.32; Mon, 09 Dec 2019 04:20:33 -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="y//BGlnh"; 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 8EFDA7FCFC; Mon, 9 Dec 2019 12:20:29 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mail.openembedded.org (Postfix) with ESMTP id 41E897FCAC for ; Mon, 9 Dec 2019 12:20:15 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id b6so15984839wrq.0 for ; Mon, 09 Dec 2019 04:20:16 -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=HK0PiRaDmtM8moT74YkfOIqATuBdwKLh/GiumAt5NP8=; b=y//BGlnhfS57et/Bhf53PBlYaCXQJ/E9IVBGed0KITf5FZWut+wkFfmmmLCHrhuy/x 63VTuxQaMVvTGAgJs68etQq/b+1eoAqakIB8WtgbPRy7goMa7+EC6ouGGrv13vwDA5oT VhdSkVQ9fjD9uEj+G9Wi8j1XgBfpzlKup28bRILUtaUbZKbTMsWUwYVMiO8+gCo2Utjy UhqGcMKsxYN6GIsv5x25AKrZf3EdJOudM3X//t95Rv7QjHv3A/N6ENDsrBwM5sFyZRpF zDOERZvDawNrcxiJZT/MpiulUMjSNreoqNzR0p4XskcD8JoMTcM7BkgpqPnPGeXiKMdd jmfw== 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=HK0PiRaDmtM8moT74YkfOIqATuBdwKLh/GiumAt5NP8=; b=TyXpJGrqHt8EpiWWX7A/8ob1zjLTWBXOQBP69eX2UNaBVW1Y7PTvZc1wngP/eiNBet 1RSlhIGRtjes6n+/v0rX/A/++iq86iZjCafNDLGCTT1bB0LzSN65Vu4Nmz9sjv0FkckF s2MzHShLBUkDyobvMNt/s8H3BrXQx8MJzDZydqnpzLC2de3o6w5nJMi6TmKWY0W7lSqV lSkcCOJNp4obpDEwvIn0lF91ZPkXWqCnd0oUWzb+zDAHoSnc+TmJv3yieqdBOd0ywytV ia8OGuTNCpTZZLM+tlf6R5NQlLqh75q3XKEuAPbaC/WIl2F9EPqikQaokZEXzd4x9Hik inHA== X-Gm-Message-State: APjAAAUqm0skQwh3fqASSwv+xQ2NmQFrTZP4YGvalJIhg9BCmxkcDFIh ipdRWBB1J80jGUC5p3bEKAXP7sC7ei4= X-Received: by 2002:adf:e6cb:: with SMTP id y11mr1877435wrm.345.1575894015731; Mon, 09 Dec 2019 04:20:15 -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.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 04:20:15 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 9 Dec 2019 12:20:05 +0000 Message-Id: <20191209122007.13306-2-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 2/4] oeqa: add insane package walk test 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 For reassurance when changing the insane.bbclass package walking code, add a sanity test to verify that the file listing is what is expected. Signed-off-by: Ross Burton --- meta-selftest/classes/insane-test.bbclass | 4 +++ meta/lib/oeqa/selftest/cases/package.py | 38 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 meta-selftest/classes/insane-test.bbclass -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta-selftest/classes/insane-test.bbclass b/meta-selftest/classes/insane-test.bbclass new file mode 100644 index 00000000000..aafb0031a5b --- /dev/null +++ b/meta-selftest/classes/insane-test.bbclass @@ -0,0 +1,4 @@ +QAPATHTEST[selftest-walk] = "package_qa_check_selftest_walk" +def package_qa_check_selftest_walk(path, pkg, d, elf, messages): + path = package_qa_clean_path(path, d, pkg) + bb.warn("WALK %s %s %s" % (pkg, path, "ELF" if elf else "FILE")) diff --git a/meta/lib/oeqa/selftest/cases/package.py b/meta/lib/oeqa/selftest/cases/package.py index c6444062674..d9725b4f2a3 100644 --- a/meta/lib/oeqa/selftest/cases/package.py +++ b/meta/lib/oeqa/selftest/cases/package.py @@ -148,3 +148,41 @@ class PackageTests(OESelftestTestCase): '/usr/libexec/hello4']: if not gdbtest(qemu, binary): self.fail('GDB %s failed' % binary) + + +class InsaneTest(OESelftestTestCase): + def test_insane_package_walk(self): + """ + Check that the package walking in insane.bbclass is listing the files we + expect. + """ + + import re + + config = """ +INHERIT += "insane-test" +WARN_QA_append_pn-selftest-hardlink = " selftest-walk" + """ + self.write_config(config) + + result = bitbake("selftest-hardlink -c package_qa -f") + expected = set(( + "selftest-hardlink:/usr/libexec/hello3:ELF", + "selftest-hardlink:/usr/libexec/hello4:ELF", + "selftest-hardlink:/usr/bin/sparsetest:FILE", + "selftest-hardlink:/usr/bin/gdb.sh:FILE", + "selftest-hardlink:/usr/bin/hello1:ELF", + "selftest-hardlink:/usr/bin/hello2:ELF", + "selftest-hardlink-dbg:/usr/libexec/.debug/hello1:ELF", + "selftest-hardlink-dbg:/usr/bin/.debug/hello1:ELF", + "selftest-hardlink-src:/usr/src/debug/selftest-hardlink/1.0-r0/hello.c:FILE" + )) + + line_re = re.compile(r"^WARNING: WALK (.+) (.+) (FILE|ELF)$") + for line in result.output.splitlines(): + m = line_re.match(line) + if m: + expected.remove(":".join(m.groups())) + + if expected: + self.fail("Not all files were listed: " + str(expected)) From patchwork Mon Dec 9 12:20:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 181021 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp4273220ile; Mon, 9 Dec 2019 04:20:39 -0800 (PST) X-Google-Smtp-Source: APXvYqyesM31SL0UMqXfBr74J8sPc0Y9z9OWapgkYs03QkFPDud2XpdLXKuQixxzGHszmTCIu3FV X-Received: by 2002:a63:c804:: with SMTP id z4mr18547870pgg.440.1575894039078; Mon, 09 Dec 2019 04:20:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575894039; cv=none; d=google.com; s=arc-20160816; b=drzTp7rR4bfYhjHjt942bYN/ffOPoYC3Wft7aDFthJ8giuCTXWDWLQYK5gLY88VlmO vZVLj6OnDwgEhIv0CZWqZZzkZdhuEVIM/TTAMirj70L2O56vOPuKWwYmCye0MSsX1nVV PZ4qn1qH8qr6z+A/hFJPBPIaGjUtfR3wzHbhSP2PDZGcWQGExunc+/IZFgdUIBkDiGK0 3OsUhd5gJQDdJB1zLOl2iAgJ1IsQiDyBY2ewH9lUt5KfykLq93r+ljeDNBp00sm08kNo eh8f3GfZBzk2b94noGmdAWeRkBGODB1mhUQq8K8VYE4VqrbRw/QjPG4w+WgQ1ykOSlGb Odag== 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=HiapSO905gRtUJGDGOF4OADmBp7ieUTM1SBO1m2tJJE=; b=FtPt71Ov6toqdValFrjHNSU+DoiqKG5K/MmOZJyc44K9nXjPgfIhJxjrNgvMn7mpP8 yHsbYraTjlAjuQYZANlXR+mFeKfrMxN7Dwak88I7raDYlm8pe4dA9zBLy+vyDbjqV3yU t0unLAQtBOYEvkjbV+cENiPFFsTO1GleJxdj+mG5mZtqNl0kdtrZU+3abIaXZQnsY8kd HCsXHypCXlSynmlpkgH47oWX/p4yF+RBEBNdwEIz6/SGCMsvH+NliaIMp+RLpUyjCqhB zAaQy+EkFH5AZ2lFcvI14cxJKLW3WSiTEnY0JOGHBNqRj4cQkFOdTqkBXKAHvQ1LAjVw Y0HA== 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=lrS7opwQ; 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 z2si17724772pfz.216.2019.12.09.04.20.38; Mon, 09 Dec 2019 04:20:39 -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=lrS7opwQ; 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 B9A297FCFF; Mon, 9 Dec 2019 12:20:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id 3599D7FCF8 for ; Mon, 9 Dec 2019 12:20:16 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id y11so15934687wrt.6 for ; Mon, 09 Dec 2019 04:20:17 -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=wXIVAr+2zHiVRflmDHtLui+FNJ2q9zVFt0jOnRYziVE=; b=lrS7opwQHtHwg2vE14/9+2iSeesdfWBt92Gnh9Qh2SOTy69L9oCWKZPafyAdKjhFUn QNkRZ4I3ivrMNUNFOoFhJ2DbfVactnGRggdG54JbW9h79gsCm+/Q3hcwBl2o3q6jPRV1 hV40TJgwXkP8get5ci8Rz2hFvQEfvNSmIrsk6zQfL/9wMdasY5E/4Pw5FaAooloAbbmn GpKZMscS7LOm3XdL3g2Hwn6cAd42l6Qceq5VIpENWgtowrz+9FLuDpG6+mD4ampMEDqr KnyrMsih+uGDqBDQ5hRLZAOrAlsbmnfHg5isOGEZPASounhMU3EIopLAKZL55BJ/zbqo aQFA== 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=wXIVAr+2zHiVRflmDHtLui+FNJ2q9zVFt0jOnRYziVE=; b=TpWD8qHm9e8PrR6N/JdKwHzStoN4leQFZ/au8x55ziRtmd7qbGMLPBAVtud8YvFJ3y GYhJ0MoMR0u/gRsNE+VGjG26akrA1ADip2Ps6GIQEE+6nOjCdNCaQ7c5IAWFZE97IFwf vlkfEBfUz0vOwX8ToxNoCDTJi1fbgxfFAyvlVUYWk1j6nflwtnPC4DYtPLcoK/uXupRv Qb7Sh+n4VQ0BJXv23dhhsB4dGWcP94DffRkrjfWIHSSXvkY736mQfLrKc2n1TwgMUCcq kxf6dA081ZXK8/wCRh/cvM8forIySph8RX/Iam58SnjdriqPIMRquD0DEqwHis1Uu0mg GKgg== X-Gm-Message-State: APjAAAW8KQfv+1YbtDNR2fSWZY9+ukgOc9VfY7iQhrzWiLm1xeza1SsZ oTWso3Hrp+wT1mlmzY+lPZq63RZXsf0= X-Received: by 2002:adf:82f3:: with SMTP id 106mr1920438wrc.69.1575894016717; Mon, 09 Dec 2019 04:20:16 -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.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 04:20:16 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 9 Dec 2019 12:20:06 +0000 Message-Id: <20191209122007.13306-3-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 3/4] rootfs: don't use oe.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/lib/oe/rootfs.py | 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/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index c62fa5f54ad..cd65e620300 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -126,17 +126,16 @@ class Rootfs(object, metaclass=ABCMeta): bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) - cpath = oe.cachedpath.CachedPath() # Copy files located in /usr/lib/debug or /usr/src/debug for dir in ["/usr/lib/debug", "/usr/src/debug"]: src = self.image_rootfs + '-orig' + dir - if cpath.exists(src): + if os.path.exists(src): dst = self.image_rootfs + dir bb.utils.mkdirhier(os.path.dirname(dst)) shutil.copytree(src, dst) # Copy files with suffix '.debug' or located in '.debug' dir. - for root, dirs, files in cpath.walk(self.image_rootfs + '-orig'): + for root, dirs, files in os.walk(self.image_rootfs + '-orig'): relative_dir = root[len(self.image_rootfs + '-orig'):] for f in files: if f.endswith('.debug') or '/.debug' in relative_dir: 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: