From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7016230395466219520 X-Received: by 2002:a7b:c4c2:: with SMTP id g2mr5384067wmk.134.1634042195591; Tue, 12 Oct 2021 05:36:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a285:: with SMTP id s5ls1920089wra.1.gmail; Tue, 12 Oct 2021 05:36:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqyjMi4zPbDDWg+dUrsj0G9PX7tXjPmnykczP7FiMvOFDhj5u50MJ6aW7IERMFwNHVy1Sz X-Received: by 2002:adf:906a:: with SMTP id h97mr31422396wrh.220.1634042194711; Tue, 12 Oct 2021 05:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634042194; cv=none; d=google.com; s=arc-20160816; b=kjDKVeYSLOkD6fn1MDBm4oOKVdcuFwTKaBVxGlEq5zngBX1nIShYnp1Bptm5Db13dY tzjKSgPt72DHLXVpi+s1vcJKICHXtp4clid8B0gzTRoyOzsHzI3VXAF+UJWKWhrlFsu0 D8TTtyN4RXgn9zieHvemJTuHrjJw9eP/8dVEw2nNAzf8zOs1eaxY8hoWmLgmg91DpgMp c1jV9fR3Gp1eVQiXsIwf8yQslka/KcXBHxiXL9qX2kfGcVVxtBPf8QlHfvnFRssvTlz4 EaDNXH/rAMaLKfQERaS0WmMfsl6OYDlVINJE1grDueSKk4cV7gXMiB/KzS4SJdphJpsI HtPA== 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=vNoOx4K6CAOzDWMcsUMOjvN7kOq0jF14N3yAoXMr7fs=; b=qVsOOniNI7VIyZprZdKsi66NBEm7NVcuBe0BNUY+G7LmKPP8O5JFelpGDbA0TcxVxw InJlOzmymIbFcT661Gm0uOOurWUGgeKHXmFqG6taGK4HWc2AmEgYT5n5mdsOBGqX6OD5 FgqTNp3nyScjjlCKHBqQABfxRk9WE6qmW7E89MDaRsZBZGBBYsQvaPXGGg+nLNh9XIXD 0XNhDItKV8jlP7m560hufIF4/gCeOFlqFKbopR/6QJ4KIhhSb0OEWshatRikuCzN35+0 HMkfyLW5W17eKvYplXhM3cSC3v7NYyNZcmVJnPWQlKaMmH9hzkWIAWvR0Rc+1TyrL8lt QHKA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id e2si744901wrj.4.2021.10.12.05.36.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Oct 2021 05:36:34 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 19CCaYYw018773 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 12 Oct 2021 14:36:34 +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 19CCaXOh017377; Tue, 12 Oct 2021 14:36:34 +0200 From: Adriaan Schmidt To: isar-users@googlegroups.com Cc: Adriaan Schmidt Subject: [PATCH v2 05/10] dpkg: add explicit dependency to isar-apt Date: Tue, 12 Oct 2021 14:36:20 +0200 Message-Id: <20211012123625.1703627-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211012123625.1703627-1-adriaan.schmidt@siemens.com> References: <20211012123625.1703627-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: PkP+aYlU5O0y The tasks do_install_builddeps and do_deploy_deb need isar-apt. So far, this is present through some implicit dependency. This makes it explicit. 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 5b9100c..99e0b38 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -244,6 +244,7 @@ do_deploy_deb() { } addtask deploy_deb after do_dpkg_build before do_build +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