From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a05:6512:230b:: with SMTP id o11mr50206062lfu.490.1636026687549; Thu, 04 Nov 2021 04:51:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:31d4:: with SMTP id j20ls140579lfe.2.gmail; Thu, 04 Nov 2021 04:51:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeaJURSmDwlvbtacxcUiuFi1IvNfoBdx4vd0G4vA/qlp5lFm/+t1WJCIzECdWR00mSuoqB X-Received: by 2002:a05:6512:3b26:: with SMTP id f38mr45475365lfv.88.1636026686502; Thu, 04 Nov 2021 04:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636026686; cv=none; d=google.com; s=arc-20160816; b=EuCUHMpuhA6v3tgAEIOXFLcQkcZW0LcXct5LtMIxJJg7uXZAows9Qba+xx9WSnJ0pg 7rHTafG7E1g8HQr2asLEUcoz4odHtVSfPO1PxeNZBzCKe9/UwucIwIAMOOLbYuObqpE1 Yo6eiIM9vdHCAc4PGkc078CKR/si1k0BmnQEL+csu6cFMgTMtNCaP0Q4i+hrNnWha9sr 14hHngRLLypm6cwnQ1yvT2s9+V6a5CvZXYWuJfcyqtiuXxdxVV7oUxlXG/LVRDZiTU96 qi3MjJni2ILxSEUQIjx21OxRjhJE83/rao++o1JatdWLS5sgCWiuQ8JdstkY4xALI+sI Lz8A== 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=yvOheyhqksQu+QDWHqEa4rOrL+nTzFsme0Pqg1xP/Q30WhZE66S20BcbwWZ6vDbojs 9Zu/KpOTK7M/wJlVEeGkySdjFlIlDR5DnpudOeg+UiywWJv2A2HjORVRFej1qt8R5zd0 VmbVpNy+lcBL6Vy1G289eB9AehgV++pZPlvSScIG2VA9rmY59w/eGpMMMgO1lST7h3iM 5CFnCpWN4a7Hg+QeC+0hplm0HR3bv58naGsCoq5a21/vwN1ohTj2+/RkRdTO4kFavSb1 iWmwDFdfJwEbgjAH0qhgTkh319koesjKUE/X0pew7ROnHOiB49gCkjjJvMmTSF/FrDi/ mEVA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id d8si370979lji.7.2021.11.04.04.51.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Nov 2021 04:51:26 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 1A4BpPRi027814 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 4 Nov 2021 12:51:25 +0100 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 1A4BpPbJ026036; Thu, 4 Nov 2021 12:51:25 +0100 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v5 05/13] dpkg: add explicit dependency to isar-apt Date: Thu, 4 Nov 2021 12:51:15 +0100 Message-Id: <20211104115123.2519356-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211104115123.2519356-1-adriaan.schmidt@siemens.com> References: <20211104115123.2519356-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: LaZOuAC5pFnZ 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