[v2,09/10] wic: misc: Add /bin to the list of searchpaths

Message ID 20200902190247.15421-1-Vijaikumar_Kanagarajan@mentor.com
State Superseded, archived
Headers show
Series WIC update | expand

Commit Message

Vijai Kumar K Sept. 2, 2020, 11:02 a.m. UTC
From: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>

/bin is also a valid path where one can find executables. Add
that to the search path.

Signed-off-by: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[cherry-picked from OE-core ca0a6025351cb2135e87cecf828633cf12aa34c6]
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 scripts/lib/wic/misc.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Henning Schild Sept. 5, 2020, 12:45 a.m. UTC | #1
We are patching wic here ... If that is upstream simply take another
version in p1.
Wic still is "clean" and purely taken from upstream, which probably
made your version bump much easier ... it probably was not easy. Dont
ruin that on the last meters.

Maybe will will reach that clean state for bitbake as well, again.

Henning

On Thu, 3 Sep 2020 00:32:46 +0530
Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> wrote:

> From: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>
> 
> /bin is also a valid path where one can find executables. Add
> that to the search path.
> 
> Signed-off-by: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> [cherry-picked from OE-core ca0a6025351cb2135e87cecf828633cf12aa34c6]
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> ---
>  scripts/lib/wic/misc.py | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
> index 91975ba..4b08d64 100644
> --- a/scripts/lib/wic/misc.py
> +++ b/scripts/lib/wic/misc.py
> @@ -138,8 +138,9 @@ def exec_native_cmd(cmd_and_args, native_sysroot,
> pseudo=""): if pseudo:
>          cmd_and_args = pseudo + cmd_and_args
>  
> -    native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \
> -                   (native_sysroot, native_sysroot, native_sysroot)
> +    native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin" % \
> +                   (native_sysroot, native_sysroot,
> +                    native_sysroot, native_sysroot)
>  
>      native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
>                     (native_paths, cmd_and_args)
vijai kumar Sept. 5, 2020, 1:33 a.m. UTC | #2
On Sat, 5 Sep 2020 at 2:15 PM, Henning Schild <henning.schild@siemens.com>
wrote:

> We are patching wic here ... If that is upstream simply take another
>
> version in p1.
>
> Wic still is "clean" and purely taken from upstream, which probably
>
> made your version bump much easier ... it probably was not easy. Dont
>
> ruin that on the last meters.
>
>
>
> Maybe will will reach that clean state for bitbake as well, again.


Ok. I will try to update to a version that has P9.


>
>
>
> Henning
>
>
>
> On Thu, 3 Sep 2020 00:32:46 +0530
>
> Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> wrote:
>
>
>
> > From: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>
>
> >
>
> > /bin is also a valid path where one can find executables. Add
>
> > that to the search path.
>
> >
>
> > Signed-off-by: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>
>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> > [cherry-picked from OE-core ca0a6025351cb2135e87cecf828633cf12aa34c6]
>
> > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
>
> > ---
>
> >  scripts/lib/wic/misc.py | 5 +++--
>
> >  1 file changed, 3 insertions(+), 2 deletions(-)
>
> >
>
> > diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
>
> > index 91975ba..4b08d64 100644
>
> > --- a/scripts/lib/wic/misc.py
>
> > +++ b/scripts/lib/wic/misc.py
>
> > @@ -138,8 +138,9 @@ def exec_native_cmd(cmd_and_args, native_sysroot,
>
> > pseudo=""): if pseudo:
>
> >          cmd_and_args = pseudo + cmd_and_args
>
> >
>
> > -    native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \
>
> > -                   (native_sysroot, native_sysroot, native_sysroot)
>
> > +    native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin" % \
>
> > +                   (native_sysroot, native_sysroot,
>
> > +                    native_sysroot, native_sysroot)
>
> >
>
> >      native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
>
> >                     (native_paths, cmd_and_args)
>
>
>
> --
>
> You received this message because you are subscribed to the Google Groups
> "isar-users" group.
>
> To unsubscribe from this group and stop receiving emails from it, send an
> email to isar-users+unsubscribe@googlegroups.com.
>
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/isar-users/20200905104504.11f7b0a9%40md1za8fc.ad001.siemens.net
> .
>
>

Patch

diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
index 91975ba..4b08d64 100644
--- a/scripts/lib/wic/misc.py
+++ b/scripts/lib/wic/misc.py
@@ -138,8 +138,9 @@  def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""):
     if pseudo:
         cmd_and_args = pseudo + cmd_and_args
 
-    native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \
-                   (native_sysroot, native_sysroot, native_sysroot)
+    native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/bin" % \
+                   (native_sysroot, native_sysroot,
+                    native_sysroot, native_sysroot)
 
     native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
                    (native_paths, cmd_and_args)