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:02 +0000 |
| commit | b7c60b97fd225ca23e648e8635a9f30e7e2591a5 (patch) | |
| tree | b9fc2db53c4f7840dea1c22b485f707be198e9c0 | |
| parent | 4a06b2fa37648204cab41a5cbfb6fa217aa32686 (diff) | |
| download | bitbake-b7c60b97fd225ca23e648e8635a9f30e7e2591a5.tar.gz | |
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]
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>
| -rw-r--r-- | lib/bb/cooker.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index e2a5dc43a..c946800a8 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -815,7 +815,9 @@ class BBCooker: for dep in rq.rqdata.runtaskentries[tid].depends: (depmc, depfn, _, deptaskfn) = bb.runqueue.split_tid_mcfn(dep) deppn = self.recipecaches[depmc].pkg_fn[deptaskfn] - depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, bb.runqueue.taskname_from_tid(dep))) + if depmc: + depmc = "mc:" + depmc + ":" + depend_tree["tdepends"][dotname].append("%s%s.%s" % (depmc, deppn, bb.runqueue.taskname_from_tid(dep))) if taskfn not in seen_fns: seen_fns.append(taskfn) packages = [] |