diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-12 10:42:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-13 16:12:24 +0000 |
commit | 77d6e148a336937946030abe3dc9eaeb9e9dd2ce (patch) | |
tree | 2b5d38b5f6a45e46c9f2ee20466e49733e7cf668 /bitbake/lib | |
parent | d507e6ea3228f0f63f0a6234027b0dd37f48c6eb (diff) | |
download | poky-77d6e148a336937946030abe3dc9eaeb9e9dd2ce.tar.gz |
bitbake: cooker: Fix task-depends.dot for multiconfig targets
The right hand side of dependencies in the task dependency file generated
by bitbake -g was missing multiconfig prefixes, corrupting the data. Fix
this.
[YOCTO #14621]
(Bitbake rev: 1d5ca721040c5e39aefa11219f62710de6587701)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index b2d8bbdbac..08e45e79d0 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -814,7 +814,9 @@ class BBCooker: | |||
814 | for dep in rq.rqdata.runtaskentries[tid].depends: | 814 | for dep in rq.rqdata.runtaskentries[tid].depends: |
815 | (depmc, depfn, _, deptaskfn) = bb.runqueue.split_tid_mcfn(dep) | 815 | (depmc, depfn, _, deptaskfn) = bb.runqueue.split_tid_mcfn(dep) |
816 | deppn = self.recipecaches[depmc].pkg_fn[deptaskfn] | 816 | deppn = self.recipecaches[depmc].pkg_fn[deptaskfn] |
817 | depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, bb.runqueue.taskname_from_tid(dep))) | 817 | if depmc: |
818 | depmc = "mc:" + depmc + ":" | ||
819 | depend_tree["tdepends"][dotname].append("%s%s.%s" % (depmc, deppn, bb.runqueue.taskname_from_tid(dep))) | ||
818 | if taskfn not in seen_fns: | 820 | if taskfn not in seen_fns: |
819 | seen_fns.append(taskfn) | 821 | seen_fns.append(taskfn) |
820 | packages = [] | 822 | packages = [] |