[dunfell,3/9] devshell.bbclass: Allow devshell & pydevshell to use the network

Message ID 214a2fe628801af3fde5b540c31f1c515f6c855f.1651531749.git.steve@sakoman.com
State New, archived
Headers show
Series [dunfell,1/9] python3: ignore CVE-2015-20107 | expand

Commit Message

Steve Sakoman May 2, 2022, 11:02 p.m. UTC
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>

Otherwise it will fail if using OE_TERMINAL = "xterm" with the not so
helpful error:

  xterm: Xt error: Can't open display: localhost:0.0

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ba53fc3bcecfe32401471dc1008c7ead96504150)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/classes/devshell.bbclass | 2 ++
 1 file changed, 2 insertions(+)

Comments

Peter Kjellerstedt May 3, 2022, 7:52 a.m. UTC | #1
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Steve Sakoman
> Sent: den 3 maj 2022 01:03
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core][dunfell 3/9] devshell.bbclass: Allow devshell &
> pydevshell to use the network
> 
> From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> 
> Otherwise it will fail if using OE_TERMINAL = "xterm" with the not so
> helpful error:
> 
>   xterm: Xt error: Can't open display: localhost:0.0
> 
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit ba53fc3bcecfe32401471dc1008c7ead96504150)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
>  meta/classes/devshell.bbclass | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
> index 76dd0b42ee..ad9f267848 100644
> --- a/meta/classes/devshell.bbclass
> +++ b/meta/classes/devshell.bbclass
> @@ -21,6 +21,7 @@ addtask devshell after do_patch
> do_prepare_recipe_sysroot
>  DEVSHELL_STARTDIR ?= "${S}"
>  do_devshell[dirs] = "${DEVSHELL_STARTDIR}"
>  do_devshell[nostamp] = "1"
> +do_devshell[network] = "1"
> 
>  # devshell and fakeroot/pseudo need careful handling since only the final
>  # command should run under fakeroot emulation, any X connection should
> @@ -154,3 +155,4 @@ python do_devpyshell() {
>  addtask devpyshell after do_patch
> 
>  do_devpyshell[nostamp] = "1"
> +do_devpyshell[network] = "1"
> --
> 2.25.1

This shouldn't be needed for Dunfell, should it? I would assume the support 
for blocking network operations per task hasn't been backported.

//Peter
Steve Sakoman May 3, 2022, 1:55 p.m. UTC | #2
On Mon, May 2, 2022 at 9:52 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org <openembedded-
> > core@lists.openembedded.org> On Behalf Of Steve Sakoman
> > Sent: den 3 maj 2022 01:03
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core][dunfell 3/9] devshell.bbclass: Allow devshell &
> > pydevshell to use the network
> >
> > From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> >
> > Otherwise it will fail if using OE_TERMINAL = "xterm" with the not so
> > helpful error:
> >
> >   xterm: Xt error: Can't open display: localhost:0.0
> >
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (cherry picked from commit ba53fc3bcecfe32401471dc1008c7ead96504150)
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> >  meta/classes/devshell.bbclass | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
> > index 76dd0b42ee..ad9f267848 100644
> > --- a/meta/classes/devshell.bbclass
> > +++ b/meta/classes/devshell.bbclass
> > @@ -21,6 +21,7 @@ addtask devshell after do_patch
> > do_prepare_recipe_sysroot
> >  DEVSHELL_STARTDIR ?= "${S}"
> >  do_devshell[dirs] = "${DEVSHELL_STARTDIR}"
> >  do_devshell[nostamp] = "1"
> > +do_devshell[network] = "1"
> >
> >  # devshell and fakeroot/pseudo need careful handling since only the final
> >  # command should run under fakeroot emulation, any X connection should
> > @@ -154,3 +155,4 @@ python do_devpyshell() {
> >  addtask devpyshell after do_patch
> >
> >  do_devpyshell[nostamp] = "1"
> > +do_devpyshell[network] = "1"
> > --
> > 2.25.1
>
> This shouldn't be needed for Dunfell, should it? I would assume the support
> for blocking network operations per task hasn't been backported.

Thanks so much for the review Peter!

Clearly I haven't yet perfected my mode switching between kirkstone
and dunfell :-(

Steve

Patch

diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 76dd0b42ee..ad9f267848 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -21,6 +21,7 @@  addtask devshell after do_patch do_prepare_recipe_sysroot
 DEVSHELL_STARTDIR ?= "${S}"
 do_devshell[dirs] = "${DEVSHELL_STARTDIR}"
 do_devshell[nostamp] = "1"
+do_devshell[network] = "1"
 
 # devshell and fakeroot/pseudo need careful handling since only the final
 # command should run under fakeroot emulation, any X connection should
@@ -154,3 +155,4 @@  python do_devpyshell() {
 addtask devpyshell after do_patch
 
 do_devpyshell[nostamp] = "1"
+do_devpyshell[network] = "1"