summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-12 10:42:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-21 11:35:41 +0000
commit79964afc90a09a699b10686a97b4154e61bb2350 (patch)
tree489c1f436ddb174de4860090618bf51257bf4bc6 /bitbake
parent6108762d0217168b52d0ac730802d26a53042699 (diff)
downloadpoky-79964afc90a09a699b10686a97b4154e61bb2350.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: c1938abf51b57938a21948bb414ad0467e4368d9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1d5ca721040c5e39aefa11219f62710de6587701) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index c032762f8d..3688aa0886 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 = []