summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-27 16:22:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-28 11:51:41 +0100
commit51f7dfe9145e8f4dbaeac02d4ccea2fec4c62fb6 (patch)
treee4f41f9972edfe1b2459de081d89fb82c2db24b3
parentf33973e591e280e4c988468f9e5a57bdf109f2df (diff)
downloadpoky-51f7dfe9145e8f4dbaeac02d4ccea2fec4c62fb6.tar.gz
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. (From OE-Core rev: d98b06c9c6f480de1e5167bfe8392e39300fc02c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/staging.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index ab827766be..9fc8f4f283 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -651,7 +651,7 @@ python target_add_sysroot_deps () {
651 taskdepdata = d.getVar("BB_TASKDEPDATA", False) 651 taskdepdata = d.getVar("BB_TASKDEPDATA", False)
652 deps = {} 652 deps = {}
653 for dep in taskdepdata.values(): 653 for dep in taskdepdata.values():
654 if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0]: 654 if dep[1] == "do_populate_sysroot" and not dep[0].endswith(("-native", "-initial")) and "-cross-" not in dep[0] and dep[0] != pn:
655 deps[dep[0]] = dep[6] 655 deps[dep[0]] = dep[6]
656 656
657 d.setVar("HASHEQUIV_EXTRA_SIGDATA", "\n".join("%s: %s" % (k, deps[k]) for k in sorted(deps.keys()))) 657 d.setVar("HASHEQUIV_EXTRA_SIGDATA", "\n".join("%s: %s" % (k, deps[k]) for k in sorted(deps.keys())))