diff options
| author | Simon Glass <sjg@chromium.org> | 2017-06-20 21:28:49 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-07-11 10:08:20 -0600 |
| commit | 7feccfdc45d5708ffd682a025d6d6e8907f1a97a (patch) | |
| tree | 799efa99d2f87eec31aaf0bc3bc36193cc6e7a63 /tools/binman | |
| parent | c07919281c521c57d34eba8bfbac910c9632beda (diff) | |
| download | u-boot-7feccfdc45d5708ffd682a025d6d6e8907f1a97a.tar.gz | |
binman: Put our local modules ahead of system modules
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>
Acked-by: Kevin Hilman <khilman@baylibre.com>
Diffstat (limited to 'tools/binman')
| -rwxr-xr-x | tools/binman/binman.py | 9 |
1 files 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 |