[U-Boot] [PATCH] binman: Put our local modules ahead of system modules

[U-Boot] [PATCH] binman: Put our local modules ahead of system modules

[Simon Glass]

If a system module is named the same as one of those used by binman we
currently pick the system module. Adjust the ordering so that our modules
are chosen instead.

The module conflict reported was 'tools' from jira-python. I cannot access
that package to test it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Kevin Hilman <khilman@baylibre.com>
---

 tools/binman/binman.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index 95d3a048d8..09dc36a3f7 100755
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -17,15 +17,14 @@ import unittest
 
 # Bring in the patman and dtoc libraries
 our_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(os.path.join(our_path, '../patman'))
-sys.path.append(os.path.join(our_path, '../dtoc'))
-sys.path.append(os.path.join(our_path, '../'))
+for dirname in ['../patman', '../dtoc', '..']:
+    sys.path.insert(0, os.path.join(our_path, dirname))
 
 # Bring in the libfdt module
-sys.path.append('tools')
+sys.path.insert(0, 'tools')
 
 # Also allow entry-type modules to be brought in from the etype directory.
-sys.path.append(os.path.join(our_path, 'etype'))
+sys.path.insert(0, os.path.join(our_path, 'etype'))
 
 import cmdline
 import command
-- 
2.13.1.611.g7e3b11ae1-goog

[U-Boot] [PATCH] binman: Put our local modules ahead of system modules

[Kevin Hilman]

Simon Glass <sjg@chromium.org> writes:

> If a system module is named the same as one of those used by binman we
> currently pick the system module. Adjust the ordering so that our modules
> are chosen instead.
>
> The module conflict reported was 'tools' from jira-python. I cannot access
> that package to test it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Kevin Hilman <khilman@baylibre.com>

While I removed the pip package that was causing me problems, this looks
basically like the workaround I had done locally.

Acked-by: Kevin Hilman <khilman@baylibre.com>

Thanks for fixing it up,

Kevin

[U-Boot] [PATCH] binman: Put our local modules ahead of system modules

[sjg at google.com]

Simon Glass <sjg@chromium.org> writes:

> If a system module is named the same as one of those used by binman we
> currently pick the system module. Adjust the ordering so that our modules
> are chosen instead.
>
> The module conflict reported was 'tools' from jira-python. I cannot access
> that package to test it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Kevin Hilman <khilman@baylibre.com>

While I removed the pip package that was causing me problems, this looks
basically like the workaround I had done locally.

Acked-by: Kevin Hilman <khilman@baylibre.com>

Thanks for fixing it up,

Kevin

Applied to u-boot-dm, thanks!

[U-Boot] [PATCH] binman: Put our local modules ahead of system modules

[sjg at google.com]

Simon Glass <sjg@chromium.org> writes:

> If a system module is named the same as one of those used by binman we
> currently pick the system module. Adjust the ordering so that our modules
> are chosen instead.
>
> The module conflict reported was 'tools' from jira-python. I cannot access
> that package to test it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Kevin Hilman <khilman@baylibre.com>

While I removed the pip package that was causing me problems, this looks
basically like the workaround I had done locally.

Acked-by: Kevin Hilman <khilman@baylibre.com>

Thanks for fixing it up,

Kevin

Applied to u-boot-dm, thanks!
Applied to u-boot-dm, thanks!