On 08.07.21 17:21, Anton Mikanovich wrote:To allow do_install_imager_deps depend on proper BUILDCHROOT based on ISAR_CROSS_COMPILE value make dependency to be dynamic. Signed-off-by: Anton Mikanovich <amikan@ilbers.de> --- meta/classes/buildchroot.bbclass | 1 + meta/classes/image-tools-extension.bbclass | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index 806a29f..1f90768 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -18,6 +18,7 @@ python __anonymous() { rootfs = d.getVar('BUILDCHROOT_HOST_DIR', True) d.setVarFlag('do_apt_fetch', 'depends', dep) + d.setVarFlag('do_install_imager_deps', 'depends', dep) d.setVar('BUILDCHROOT_DIR', rootfs) } diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 4738479..df32911 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -14,7 +14,6 @@ IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" DEPENDS += "${IMAGER_BUILD_DEPS}" -do_install_imager_deps[depends] = "buildchroot-target:do_build"As explained, this pattern is cleaner than pushing the dependency to the required task. Same is true for do_apt_fetch, but that is not in scope of this patch. You should resolve which buildchroot you need and add the dependency here, in the proper context.do_install_imager_deps[deptask] = "do_deploy_deb" do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_imager_deps() {Jan
Ok, to not waste a time on half-measures I've rebuilt both do_apt_fetch
and do_install_imager_deps dependencies in `[PATCH v3 0/3] Fix
imager-buildchroot dependency` patchset. Please, review.
-- Anton Mikanovich Promwad Ltd. External service provider of ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn, Germany +49 (89) 122 67 24-0 Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov