summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cooker.py
diff options
context:
space:
mode:
authorAlejandro Enedino Hernandez Samaniego <alejandro.enedino.hernandez-samaniego@xilinx.com>2018-07-25 09:01:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-01 10:07:22 +0100
commitb8730f68d22b9c1ebd012ffd7aedccd22cceb0da (patch)
tree18dcab42041ff11a5c554e1bc798f9df0fc158fc /bitbake/lib/bb/cooker.py
parent7df8a4f834e059e5beddc9f7bedec4f4a5a668d3 (diff)
downloadpoky-b8730f68d22b9c1ebd012ffd7aedccd22cceb0da.tar.gz
bitbake: bitbake: Add support for multiconfig dependencies
This patch adds the capability for tasks from different multiconfigs to depend on one another. These dependencies can be enabled using the following format: task[mcdepends] = "multiconfig:FROM-MC:TO-MC:PN:task-to-depend-on" For the sake of simplicity consider the following example: Assuming we have set up multiconfig builds, one for qemux86 and one for qemuarm, named x86 and arm respectively. Adding the following line to an image recipe (core-image-sato): do_image[mcdepends] = "multiconfig:x86:arm:core-image-minimal:do_rootfs" Would state that core-image-sato:do_image from x86 will depend on core-image-minimal:do_rootfs from arm so it can be executed. This patch makes modifications to: - cooker: To glue both multiconfigs in one place and make sure the dependencies can be provided. - taskdata: To parse and add a new kind of dependency (mcdepends) to the taskdata object. - runqueue: To differentiate tasks from different multiconfigs, add the specified dependencies to the corresponding tasks, and create a working runqueue that contains tasks from both multiconfigs. - siggen: To avoid looking for tasks from different multiconfigs on objects where they dont belong. The taskdata objects are still not aware of the concept of multiconfig, so each object doesnt know which multiconfig its building, hence why the mcdepends are added to all taskdata objects equally (we really dont expect many of these), but the actual dependencies are added only to the required tasks by the runqueue. (Bitbake rev: da8cb8633504bdc815bdcefc538340b9bce5065d) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r--bitbake/lib/bb/cooker.py34
1 files changed, 31 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 1fda40dd41..946ba9ca06 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -609,7 +609,14 @@ class BBCooker:
609 k2 = k.split(":do_") 609 k2 = k.split(":do_")
610 k = k2[0] 610 k = k2[0]
611 ktask = k2[1] 611 ktask = k2[1]
612 taskdata[mc].add_provider(localdata[mc], self.recipecaches[mc], k) 612 if mc:
613 # Provider might be from another mc
614 for mcavailable in self.multiconfigs:
615 # The first element is empty
616 if mcavailable:
617 taskdata[mcavailable].add_provider(localdata[mcavailable], self.recipecaches[mcavailable], k)
618 else:
619 taskdata[mc].add_provider(localdata[mc], self.recipecaches[mc], k)
613 current += 1 620 current += 1
614 if not ktask.startswith("do_"): 621 if not ktask.startswith("do_"):
615 ktask = "do_%s" % ktask 622 ktask = "do_%s" % ktask
@@ -620,6 +627,27 @@ class BBCooker:
620 runlist.append([mc, k, ktask, fn]) 627 runlist.append([mc, k, ktask, fn])
621 bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data) 628 bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data)
622 629
630 mcdeps = taskdata[mc].get_mcdepends()
631 # No need to do check providers if there are no mcdeps or not an mc build
632 if mcdeps and mc:
633 # Make sure we can provide the multiconfig dependency
634 seen = set()
635 new = True
636 while new:
637 new = False
638 for mc in self.multiconfigs:
639 for k in mcdeps:
640 if k in seen:
641 continue
642 l = k.split(':')
643 depmc = l[2]
644 if depmc not in self.multiconfigs:
645 bb.fatal("Multiconfig dependency %s depends on nonexistent mc configuration %s" % (k,depmc))
646 else:
647 logger.debug(1, "Adding providers for multiconfig dependency %s" % l[3])
648 taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3])
649 seen.add(k)
650 new = True
623 for mc in self.multiconfigs: 651 for mc in self.multiconfigs:
624 taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc]) 652 taskdata[mc].add_unresolved(localdata[mc], self.recipecaches[mc])
625 653
@@ -706,8 +734,8 @@ class BBCooker:
706 if not dotname in depend_tree["tdepends"]: 734 if not dotname in depend_tree["tdepends"]:
707 depend_tree["tdepends"][dotname] = [] 735 depend_tree["tdepends"][dotname] = []
708 for dep in rq.rqdata.runtaskentries[tid].depends: 736 for dep in rq.rqdata.runtaskentries[tid].depends:
709 (depmc, depfn, deptaskname, deptaskfn) = bb.runqueue.split_tid_mcfn(dep) 737 (depmc, depfn, _, deptaskfn) = bb.runqueue.split_tid_mcfn(dep)
710 deppn = self.recipecaches[mc].pkg_fn[deptaskfn] 738 deppn = self.recipecaches[depmc].pkg_fn[deptaskfn]
711 depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, bb.runqueue.taskname_from_tid(dep))) 739 depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, bb.runqueue.taskname_from_tid(dep)))
712 if taskfn not in seen_fns: 740 if taskfn not in seen_fns:
713 seen_fns.append(taskfn) 741 seen_fns.append(taskfn)