diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-27 16:22:06 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-04 13:07:34 +0100 |
| commit | 5077019ae14011a56cd94d7118704e371ca86457 (patch) | |
| tree | ad5aaa59edab4909a43e8650e4068d596304d804 /meta | |
| parent | dfe1dd65e3142293735043659fab96b1a768bdc9 (diff) | |
| download | poky-5077019ae14011a56cd94d7118704e371ca86457.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: a1eba0f2d36f3bb03323a65c66dd2a83c5dd2c05)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d98b06c9c6f480de1e5167bfe8392e39300fc02c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/staging.bbclass | 2 |
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()))) |
