dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

binman: Put our local modules ahead of system modules

Browse Source 
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:
Simon Glass
2017-06-20 21:28:49 -06:00
parent c07919281c
commit 7feccfdc45
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/binman/binman.py
View File

@@ -17,15 +17,14 @@ import unittest
# Bring in the patman and dtoc libraries # Bring in the patman and dtoc libraries
our_path = os.path.dirname(os.path.realpath(__file__)) our_path = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(our_path, '../patman')) for dirname in ['../patman', '../dtoc', '..']:
sys.path.append(os.path.join(our_path, '../dtoc')) sys.path.insert(0, os.path.join(our_path, dirname))
sys.path.append(os.path.join(our_path, '../'))
# Bring in the libfdt module # 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. # 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 cmdline
import command import command