From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a05:6512:1087:: with SMTP id j7mr23568095lfg.488.1635251300727; Tue, 26 Oct 2021 05:28:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3499:: with SMTP id v25ls175313lfr.0.gmail; Tue, 26 Oct 2021 05:28:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhI6p7PmuSfF1jY57IVkJFMZaBvzEc9ZmxWygOlvrFmK/J4Je9t+AnznN6/l0VeqIp00ha X-Received: by 2002:ac2:4281:: with SMTP id m1mr23091636lfh.354.1635251299815; Tue, 26 Oct 2021 05:28:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635251299; cv=none; d=google.com; s=arc-20160816; b=BfN+m+ZNna3T6Xm+2rgjax0jAFKht89fD8RP4G1uIcb5BCcGXxM+kvwQ+vGkqvq7jp HAJeiL07CFSKAAFrP85PeZYSud8wVRT3LEV1xsp/1Q1cYn0e4WpWG2KCyOlSa+12GxLx R+4p840hU78P4bcwoIOy3vsBRj0AXgbl+CnaDRxAohaNHLyzfR5x21hH/Mb0qA0BsBlg VRhOGaCDnCbgI7uUFj3QEF4kZ+YRaGtdb5mJjqnsfXZMbemULUGB111x5AzgZwMn5uOP P7FauFJMiehpqBlu2sYaQpA5/MUlTXTVYBroLjR38/lVjfksNSaCp8tFT1wC/60qHpOh z2tQ== 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=WrsOZKK1Wjz8qbkY679De8UBYIC2wI9hLb/gWt4IAi6b6jRwDpHqJkwviZLJEDc1Qp HAXGT/DIdGyxNmWNXb/ZpkWow0A7L/QiEAvajC8F9TIDmKnX8HN7VMHc16Q/E7s+5oCm 0vM7BFH7LKwe7FKs401h2Bbbq0EKL7uTwwFTkUedDF6wSTjnEibaJKuBApciOHbDcmj4 bEOvn7GoBAX6yyIWRYdeCivJ7LorkAq3E6FcvDWtYS7F6ny5Xqxs6WltwEmsiHMAUPMP WLaPLpYnoyZJMUoE58Vo/UPaZ3mNJpV/BVbXsCEpqA72tB2AZ9bbtqcv3U8vTPwUywDd mQ9w== 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 a19si298322ljq.1.2021.10.26.05.28.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Oct 2021 05:28:19 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 19QCSJtl014397 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Oct 2021 14:28:19 +0200 Received: from random.ppmd.siemens.net (random.ppmd.siemens.net [139.25.68.25]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 19QCSIPN013081; Tue, 26 Oct 2021 14:28:19 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v4 05/10] dpkg: add explicit dependency to isar-apt Date: Tue, 26 Oct 2021 14:28:06 +0200 Message-Id: <20211026122811.2654125-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211026122811.2654125-1-adriaan.schmidt@siemens.com> References: <20211026122811.2654125-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 94HxcEEcPwl6 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