[PATCH 1/2] fix(dpkg-build): add missing dependencies to base-apt and isar-apt

[Felix Moessbauer]

When taking the rootfs from the sstate cache, the isar-apt and base-apt
might not have been deployed when running sbuild. By that, this task
will fail. This dependency has been missing ever since, but before
having fully a reproducible sbuild-chroot rootfs, the problematic
situation probably could not be hit.

We fix it by adding the missing dependencies.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---
meta/classes-recipe/dpkg-base.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes-recipe/dpkg-base.bbclass b/meta/classes-recipe/dpkg-base.bbclass
index 610213b8..4a81787e 100644
--- a/meta/classes-recipe/dpkg-base.bbclass
+++ b/meta/classes-recipe/dpkg-base.bbclass
@@ -208,7 +208,7 @@ do_dpkg_build[cleandirs] = "${DEPLOYDIR}"
do_dpkg_build[sstate-inputdirs] = "${DEPLOYDIR}"
do_dpkg_build[sstate-outputdirs] = "${DEPLOY_DIR_DEB}"
do_dpkg_build[network] = "${TASK_USE_NETWORK_AND_SUDO}"
-do_dpkg_build[depends] = "${SCHROOT_DEP}"
+do_dpkg_build[depends] = "${SCHROOT_DEP} base-apt:do_cache isar-apt:do_cache_config"
do_dpkg_build[postfuncs] += "dpkg_collect_debs"

addtask dpkg_build
--
2.53.0

[Felix Moessbauer]

When taking the rootfs from the sstate cache, the isar-apt and base-apt

might not have been deployed when running fetch_common_source. By that,
this task will fail.

We fix it by adding the missing dependencies.

Fixes: 2ca3a7e5 ("dpkg-source: Build source package only once")

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---

meta/classes-recipe/dpkg-source.bbclass | 1 +
1 file changed, 1 insertion(+)

diff --git a/meta/classes-recipe/dpkg-source.bbclass b/meta/classes-recipe/dpkg-source.bbclass
index a1848473..b2b45ed3 100644
--- a/meta/classes-recipe/dpkg-source.bbclass
+++ b/meta/classes-recipe/dpkg-source.bbclass
@@ -110,6 +110,7 @@ EOF
do_fetch_common_source[depends] += "${SCHROOT_DEP} ${BPN}:do_deploy_source"
do_fetch_common_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock"
do_fetch_common_source[network] = "${TASK_USE_SUDO}"
+do_fetch_common_source[depends] += "base-apt:do_cache isar-apt:do_cache_config"
do_fetch_common_source() {
fetch_common_source_${ISAR_CHROOT_MODE}
}
--
2.53.0

[Zhihang Wei]

Applied to next, thanks.

Zhihang