diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-22 10:24:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-24 10:08:28 +0000 |
commit | 34ead7d30b42be9aa8967d9fd1dda9fb3b375d5e (patch) | |
tree | 9c0dfed690d2c60f542e0841daa2fad73ad1bc84 /bitbake/lib/bb | |
parent | e1b119ca21584fea5ba7076d9027d9154b6cbc4f (diff) | |
download | poky-34ead7d30b42be9aa8967d9fd1dda9fb3b375d5e.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: b7c60b97fd225ca23e648e8635a9f30e7e2591a5)
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/lib/bb')
-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 e2a5dc43a9..c946800a8c 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -815,7 +815,9 @@ class BBCooker: | |||
815 | for dep in rq.rqdata.runtaskentries[tid].depends: | 815 | for dep in rq.rqdata.runtaskentries[tid].depends: |
816 | (depmc, depfn, _, deptaskfn) = bb.runqueue.split_tid_mcfn(dep) | 816 | (depmc, depfn, _, deptaskfn) = bb.runqueue.split_tid_mcfn(dep) |
817 | deppn = self.recipecaches[depmc].pkg_fn[deptaskfn] | 817 | deppn = self.recipecaches[depmc].pkg_fn[deptaskfn] |
818 | depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, bb.runqueue.taskname_from_tid(dep))) | 818 | if depmc: |
819 | depmc = "mc:" + depmc + ":" | ||
820 | depend_tree["tdepends"][dotname].append("%s%s.%s" % (depmc, deppn, bb.runqueue.taskname_from_tid(dep))) | ||
819 | if taskfn not in seen_fns: | 821 | if taskfn not in seen_fns: |
820 | seen_fns.append(taskfn) | 822 | seen_fns.append(taskfn) |
821 | packages = [] | 823 | packages = [] |