From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a05:6512:2182:: with SMTP id b2mr4460169lft.311.1636613259542; Wed, 10 Nov 2021 22:47:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1687:: with SMTP id bd7ls366144ljb.10.gmail; Wed, 10 Nov 2021 22:47:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUgcqajGG4yJYnnVvyN8GGjq9wATv8R98Zu0VpEz6TZ8izDcmXA4FKOB3IpD+/ml8tJU6f X-Received: by 2002:a2e:3513:: with SMTP id z19mr4898908ljz.406.1636613258335; Wed, 10 Nov 2021 22:47:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636613258; cv=none; d=google.com; s=arc-20160816; b=kMEJIxYVIuK1aFnGaifs0Le8bOAcx0nZyEEMkx/Zav30nCoVTvAIg6eyRBcSspjvoY HeJ06q9pAFMR/l3KdFyJ9wMUFaOSDAd+g3IKwluApHR7RDwVEBruRB7ZbwZ5wm5boTYP fBYBwCiBKF3aZmP7bu1ioenRRVqW/bnU2Qr2FKI/xNhqC/7n/J4RFyzI19TBqN8e2RvG RTUKe6YeVLj9mgzYiA3hmlLhEOMu+fegiDtoT2xdEe4TyLi1TeZOkCKlERHye+AGxVQw 5YHxFdfUm46KtCd6bXuhzKjE3ATW4Zl9RSGN7fUGC1IVdhWW3+8tnBPcMbkjIbvRk2U2 +ptw== 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=gUFNa390Bm/XmvxDC9AQ/ePBdsnzj3bHeDgpsY2C5eoH0WyegTWus2juTAnqRnJqk6 Pjgq5SAxi/tuFJN4JmfPxQBVRhkc540t+s9gk2OVY6TSWkCsvJP5PiuulCloPmMn+VXJ FO2utGec41GuXrVTBFwe6U+iUcbN3OpmT5EcIAiXZlX1GWJS7WjNqyXQcg0fcCYjFY4X +7kInbSGHFHALeQDVMjObEhO6FhNMcf3RQ6TgsuZKmy65lnXZksfRWf/eaNPVQJie+Ik ChlO/m2Ry/FLV1eKj3x7WEyEYXbyem/fPLTu21iE16PeqDCDRugF61Qa0eov3AU4las+ PC8w== 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 c11si144073ljr.8.2021.11.10.22.47.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Nov 2021 22:47:38 -0800 (PST) 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 1AB6lbsJ020694 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 11 Nov 2021 07:47:37 +0100 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 1AB6lbcY012388; Thu, 11 Nov 2021 07:47:37 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v6 05/13] dpkg: add explicit dependency to isar-apt Date: Thu, 11 Nov 2021 07:47:20 +0100 Message-Id: <20211111064728.2375760-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211111064728.2375760-1-adriaan.schmidt@siemens.com> References: <20211111064728.2375760-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: tcZ2uYSz/ZHc 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