mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
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>
This commit is contained in:
parent
c07919281c
commit
7feccfdc45
1 changed files with 4 additions and 5 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue