From: Uladzimir Bely <ubely@ilbers.de>
To: Felix Moessbauer <felix.moessbauer@siemens.com>,
isar-users@googlegroups.com
Subject: Re: [PATCH 1/1] fix dependencies of devshell tasks
Date: Tue, 23 Jan 2024 12:13:24 +0300 [thread overview]
Message-ID: <55a2741c7757e868af6491c207072ce7e436ed93.camel@ilbers.de> (raw)
In-Reply-To: <20240117103730.241499-1-felix.moessbauer@siemens.com>
On Wed, 2024-01-17 at 11:37 +0100, 'Felix Moessbauer' via isar-users
wrote:
> In 21a0560 the local_isarapt task was introduced, which needs to run
> before the devshell. By that, the dependencies of the devshell tasks
> got updated as well. However, the do_prepare_build also needs to run
> before the devshell, as otherwise the preparation logic is not
> executed.
>
> This commit re-introduces (adds) this dependency again.
>
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
> meta/classes/dpkg-base.bbclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-
> base.bbclass
> index 7b054d3f..95ca3db8 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -323,7 +323,7 @@ python do_devshell() {
> bb.build.exec_func('schroot_delete_configs', d)
> }
>
> -addtask devshell after do_local_isarapt
> +addtask devshell after do_local_isarapt do_prepare_build
> DEVSHELL_STARTDIR ?= "${S}"
> do_devshell[dirs] = "${DEVSHELL_STARTDIR}"
> do_devshell[nostamp] = "1"
> @@ -335,7 +335,7 @@ python do_devshell_nodeps() {
>
> # devshell may be placed after do_instell_builddeps in downstream
> classes.
> # devshell_nodeps will always stay right after do_prepare_build.
> -addtask devshell_nodeps after do_local_isarapt
> +addtask devshell_nodeps after do_local_isarapt do_prepare_build
> do_devshell_nodeps[dirs] = "${DEVSHELL_STARTDIR}"
> do_devshell_nodeps[nostamp] = "1"
> do_devshell_nodeps[network] = "${TASK_USE_SUDO}"
> --
> 2.39.2
>
Applied to next, thanks.
prev parent reply other threads:[~2024-01-23 9:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-17 10:37 Felix Moessbauer
2024-01-17 10:45 ` Jan Kiszka
2024-01-23 9:13 ` Uladzimir Bely [this message]
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=55a2741c7757e868af6491c207072ce7e436ed93.camel@ilbers.de \
--to=ubely@ilbers.de \
--cc=felix.moessbauer@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