public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Adriaan Schmidt <adriaan.schmidt@siemens.com>
To: isar-users@googlegroups.com
Cc: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Subject: [PATCH v2 05/10] dpkg: add explicit dependency to isar-apt
Date: Tue, 12 Oct 2021 14:36:20 +0200	[thread overview]
Message-ID: <20211012123625.1703627-6-adriaan.schmidt@siemens.com> (raw)
In-Reply-To: <20211012123625.1703627-1-adriaan.schmidt@siemens.com>

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 <adriaan.schmidt@siemens.com>
---
 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


  parent reply	other threads:[~2021-10-12 12:36 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-12 12:36 [PATCH v2 00/10] Add sstate-cache Adriaan Schmidt
2021-10-12 12:36 ` [PATCH v2 01/10] oe imports in central location Adriaan Schmidt
2021-10-12 12:36 ` [PATCH v2 02/10] wic-img: create deploy dir Adriaan Schmidt
2021-10-12 12:36 ` [PATCH v2 03/10] rootfs: recursively depend on packages Adriaan Schmidt
2021-10-13 14:29   ` Jan Kiszka
2021-10-13 14:43     ` Schmidt, Adriaan
2021-10-13 15:09       ` Jan Kiszka
2021-10-13 15:18         ` Schmidt, Adriaan
2021-10-13 16:01           ` Jan Kiszka
2021-10-19  8:10             ` Schmidt, Adriaan
2021-10-12 12:36 ` [PATCH v2 04/10] base: remove unneeded "before do_build" task dependencies Adriaan Schmidt
2021-10-12 12:36 ` Adriaan Schmidt [this message]
2021-10-12 12:36 ` [PATCH v2 06/10] meta: add sstate feature from oe Adriaan Schmidt
2021-10-12 12:36 ` [PATCH v2 07/10] sstate: configure Adriaan Schmidt
2021-10-12 12:36 ` [PATCH v2 08/10] sstate: add caching to isar-bootstrap Adriaan Schmidt
2021-10-13 14:17   ` Anton Mikanovich
2021-10-19  8:11     ` Schmidt, Adriaan
2021-10-12 12:36 ` [PATCH v2 09/10] sstate: add caching to rootfs Adriaan Schmidt
2021-10-12 12:36 ` [PATCH v2 10/10] sstate: add caching to debian packages Adriaan Schmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211012123625.1703627-6-adriaan.schmidt@siemens.com \
    --to=adriaan.schmidt@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox