[PATCH] binman: Handle tool paths containing '~' correctly

Simon Glass sjg at chromium.org
Mon Nov 9 15:45:02 CET 2020


At present if CROSS_COMPILE contains a tilde, such as
~/.buildman-toolchains/gcc-7.3.0-nolibc/i386-linux/bin/i386-linux-gcc
then binman gives a confusing error:

   binman: Error 255 running '~/..buildman-toolchains/gcc-7.3.0- ...

Fix this by expanding it out before running the tool.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 tools/patman/tools.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/patman/tools.py b/tools/patman/tools.py
index bbb157da873..05b1a1d4b08 100644
--- a/tools/patman/tools.py
+++ b/tools/patman/tools.py
@@ -333,6 +333,7 @@ def Run(name, *args, **kwargs):
         elif for_host:
             name, extra_args = GetHostCompileTool(name)
             args = tuple(extra_args) + args
+        name = os.path.expanduser(name)  # Expand paths containing ~
         all_args = (name,) + args
         result = command.RunPipe([all_args], capture=True, capture_stderr=True,
                                  env=env, raise_on_error=False, binary=binary)
-- 
2.29.2.222.g5d2a92d10f8-goog



More information about the U-Boot mailing list