From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 27 Apr 2022 15:22:06 +0000 (+0100)
Subject: staging: Ensure we filter out ourselves
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~4306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d98b06c9c6f480de1e5167bfe8392e39300fc02c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

staging: Ensure we filter out ourselves

Adding a dependency on ourselves in this function doesn't make sense, the hash
may change after hash equivalence is applied. Other code using BB_TASKDEPDATA does
handle the self reference correctly (which is there for a reason), update this
code to do likewise.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index ab827766bef..9fc8f4f2839 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -651,7 +651,7 @@ python target_add_sysroot_deps () {
     taskdepdata = d.getVar("BB_TASKDEPDATA", False)
     deps = {}
     for dep in taskdepdata.values():
-        if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0]:
+        if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0] and dep[0] != pn:
             deps[dep[0]] = dep[6]
 
     d.setVar("HASHEQUIV_EXTRA_SIGDATA", "\n".join("%s: %s" % (k, deps[k]) for k in sorted(deps.keys())))