From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:adf:bd91:: with SMTP id l17mr42239102wrh.261.1634632164354; Tue, 19 Oct 2021 01:29:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6b08:: with SMTP id v8ls407098wrw.3.gmail; Tue, 19 Oct 2021 01:29:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKO+1VAXL4opS5sCliCgQFTQzm8k74+jbg/FLGVWjy8udTph3L5nWHERxhOLOSPEW3M0jy X-Received: by 2002:adf:b64a:: with SMTP id i10mr42415197wre.244.1634632163501; Tue, 19 Oct 2021 01:29:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634632163; cv=none; d=google.com; s=arc-20160816; b=FVLz7Z0kMjov7CzK+QqyoXJgs/vLvlYY//e46bcSZpH//PmxtJ8kFLWMIfW4vYX8af FEbR6BKYwJCir/moPag69yN2wPtWfdsLRw7vnOdySRECZNs7HpBrRk+fCivwkHheqVn+ WIg9OiiuL9jlcjS4s1Fk42neKsY/eRB0BeR5yn4hnyRciRQP3apC0eupV1ey1ABuTBC6 9wjQgqeu+QxPzCjdDotFiZj4kdCwzw8SinM2W1QDB+Jzw8a8zTzrrVtXFPwAxWTnbKmW X8tEAwTLr8RPbQ9afL7UKau3tS1yWsde4S9cF9FiiyRoq7g/TqhgbBuhjVmEBlw9zn2f zV4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Bm7TrYZ2B21ChDvRwJnxSlq2nNK4quo6rZbgZ+zmjrc=; b=O4RlauY0IgJRuflJoP7QFCaDDLqqGTq/u/H5FzYx35A1n47TR4mW371A0b4RGGrEht VEeUJDz8NN3YSScFTU4UghC9NjePCTphPdZKsvj/wj+XfFGJ55MNeEHN1QdYWeK+1WTQ cJGgadhs/om7R/kuNWBk/3xmwSBkSAwaDCuteDdkEUm+1np8+RTi14E1XWwaIgPD9XTF FXC60CLEdOG86MnNZGJI8mvzkAXYoU4hYdK4jiMZNBJHq3nugDrbmoCSYEA1ChTJoHqp 8EK1Z35eilXdKv40UJODuGGBYkaC6m32Nz9W2d949a7pbCm7AKa8iCmYu7GR4O3RimpB rqSA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id q74si111266wme.2.2021.10.19.01.29.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Oct 2021 01:29:23 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 19J8TN2C028097 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Oct 2021 10:29:23 +0200 Received: from random.ppmd.siemens.net (random.ppmd.siemens.net [139.25.68.25]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 19J8TMYC002966; Tue, 19 Oct 2021 10:29:22 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v3 05/10] dpkg: add explicit dependency to isar-apt Date: Tue, 19 Oct 2021 10:29:08 +0200 Message-Id: <20211019082913.199818-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019082913.199818-1-adriaan.schmidt@siemens.com> References: <20211019082913.199818-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: WnMpe7MQxIcO Again, make dependencies more precise and explicit. The tasks do_install_builddeps and do_deploy_deb need isar-apt, which is usually "just there" because other early tasks pull this in. When using caching, one example of what can happen is: We run with empty builddir and warm cache, and request the build of a single package. With a cache hit, the only task that will run is the packages do_deploy_deb. So this needs an explicit dependency on isar-apt. Same for install_builddeps and install_imager_deps. Signed-off-by: Adriaan Schmidt --- meta/classes/dpkg-base.bbclass | 1 + meta/classes/dpkg.bbclass | 1 + meta/classes/image-tools-extension.bbclass | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index eddf643..7e372de 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -245,6 +245,7 @@ do_deploy_deb() { addtask deploy_deb after do_dpkg_build before do_build do_deploy_deb[deptask] = "do_deploy_deb" +do_deploy_deb[depends] += "isar-apt:do_cache_config" do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_deploy_deb[dirs] = "${S}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 4e7c2f7..ef668f6 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -23,6 +23,7 @@ do_install_builddeps() { } addtask install_builddeps after do_prepare_build before do_dpkg_build +do_install_builddeps[depends] += "isar-apt:do_cache_config" # apt and reprepro may not run in parallel, acquire the Isar lock do_install_builddeps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 9f28800..b996813 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -14,7 +14,7 @@ IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" DEPENDS += "${IMAGER_BUILD_DEPS}" -do_install_imager_deps[depends] = "${BUILDCHROOT_DEP}" +do_install_imager_deps[depends] = "${BUILDCHROOT_DEP} isar-apt:do_cache_config" do_install_imager_deps[deptask] = "do_deploy_deb" do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" do_install_imager_deps() { -- 2.30.2