From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6982225646555496448 X-Received: by 2002:a7b:c10b:: with SMTP id w11mr9766114wmi.185.1626245823522; Tue, 13 Jul 2021 23:57:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4c50:: with SMTP id n16ls1618721wrt.2.gmail; Tue, 13 Jul 2021 23:57:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNHdDiENNYrYcb2IKJYWXOrIMUvAdyEm68JCJMEchCSm3x7KgzF3OQ0+JxeDbO94FNdL2k X-Received: by 2002:adf:de84:: with SMTP id w4mr11036310wrl.104.1626245822807; Tue, 13 Jul 2021 23:57:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626245822; cv=none; d=google.com; s=arc-20160816; b=L2HmP+/X33A5pwoq2KB+4mn7aMXPICp+aHZLN6I2XiAEuIdPQAXWbO47wQOiJQ/YnI 64+NddHUn/E86/XcJLjImrmnzmK9Db912S77eViv7wmGOx64Nk5Lnf6ZH4MLvvO7ALaG +nLzUu/pcfbWqUtGmIo95HATQn3RMJJeTxLla9/e7fPvMdZdcOcgQLPLWeDdCHLXmbUw G6IvbydP9R4xUKN04SqWRqOXT4Ahl82y5GdAD2W+6xMTDNyVq+k8NT7vg17ElBnpOgU0 Z+O066Za0V5vs/wkX62FAm3QvDhH16mauZAwYO3JDCzvKo14Hs72h1FQuOQlicpI2j/E rJYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:subject; bh=HA1WpE7OqYFGSqA4TOPkgeLvsTQ7xx+/a2FlkYKa+Xk=; b=rgbB3ELSyg8vYxfMWyWYxAD1r0c03aipjVepuMfLW5OFOvkSjegj0mv3tggRhqoFBu wamfNASkIxFcxtbXmzy/lJhKadfM8PaUEV4Q0tFvswEZ+hlE8Ox3L9gzZg3HGz4qDxGG Yf5U/tVJvowPEdjBEXUGZydbQd/96drRdphfUP6PEOSBFoQr+a9z8bYAuehUWqbd+e9E ntV4E8F0nNze44lg30wwTcg7RuOaCcqLDeN/UV3hq5DusL77HISSXCxl1++fJ1OwiNzu kCC3RR1covjLf2bqwrNpD8f9htPVp5jWC4Kf78y/nZixRX08R3uSsccbxivXJgu1sqwg zmgQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id z70si256915wmc.0.2021.07.13.23.57.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jul 2021 23:57:02 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from [192.168.67.164] (mm-40-58-214-37.mgts.dynamic.pppoe.byfly.by [37.214.58.40] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16E6v1eE031132 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Jul 2021 08:57:02 +0200 Subject: Re: [PATCH v2] buildchroot: Add buildchroot dependency for imager To: Jan Kiszka , isar-users@googlegroups.com References: <20210708152136.220186-1-amikan@ilbers.de> <33353ffa-63c3-ab32-4dce-05a51174db2c@siemens.com> From: Anton Mikanovich Message-ID: Date: Wed, 14 Jul 2021 09:56:56 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <33353ffa-63c3-ab32-4dce-05a51174db2c@siemens.com> Content-Type: multipart/alternative; boundary="------------5189F67303D4AD494082B3D5" Content-Language: en-US X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,HTML_MESSAGE autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: LOF14OFvBYpE This is a multi-part message in MIME format. --------------5189F67303D4AD494082B3D5 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit 08.07.2021 19:20, Jan Kiszka wrote: > 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 >> --- >> 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 --------------5189F67303D4AD494082B3D5 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit 08.07.2021 19:20, Jan Kiszka wrote:
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
--------------5189F67303D4AD494082B3D5--