| Message ID | 20240117103730.241499-1-felix.moessbauer@siemens.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/1] fix dependencies of devshell tasks | expand |
On 17.01.24 11:37, '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}" Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com> Seems the comment above was not read while doing the previous change. ;) Jan
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.
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}"
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(-)