[PATCH v5 03/13] rootfs: recursively depend on packages

[Adriaan Schmidt <adriaan.schmidt@siemens.com>]

This specifies dependencies more precisely, which becomes
important when we introduce caching.

The current definition of deptask can lead to errors, e.g.:
If rootfs includes A which depends on B, then currently rootfs
depends on A's do_deploy_deb, but only A's do_prepare_build
depends on B's do_deploy_deb. So if we can produce A from cache
without running its do_prepare_build, B might not be there.
This is of course never observed when building from scratch.

Setting recrdeptask instead fixes this, which is also how it's
done in OE.

The same thing can happen when building packages. Unfortunately
setting `do_prepare_build[recrdeptask] = "do_deploy_deb"`
makes a recipes do_prepare_build depend on its own do_deploy_deb,
creating a dependency loop. This is solved by making do_deploy_deb
depend on the do_deploy_deb task of dependent recipes. Not precisely
what we want, but should have the same effect.

Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 1 +
 meta/classes/rootfs.bbclass    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 8a39a6d..2005707 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -244,6 +244,7 @@ do_deploy_deb() {
 }
 
 addtask deploy_deb after do_dpkg_build before do_build
+do_deploy_deb[deptask] = "do_deploy_deb"
 do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock"
 do_deploy_deb[dirs] = "${S}"
 
diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 20ccb00..b38de66 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -153,7 +153,7 @@ rootfs_install_pkgs_install() {
 do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}"
 do_rootfs_install[vardeps] += "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMMAND}"
 do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build"
-do_rootfs_install[deptask] = "do_deploy_deb"
+do_rootfs_install[recrdeptask] = "do_deploy_deb"
 python do_rootfs_install() {
     configure_cmds = (d.getVar("ROOTFS_CONFIGURE_COMMAND", True) or "").split()
     install_cmds = (d.getVar("ROOTFS_INSTALL_COMMAND", True) or "").split()
-- 
2.30.2