mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
binman: Move the tools directory into the Bintool class
We want to be able to change this directory. Use a class member to hold the value, since changing a constant is not good. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
@@ -43,8 +43,6 @@ FETCH_NAMES = {
|
||||
# Status of tool fetching
|
||||
FETCHED, FAIL, PRESENT, STATUS_COUNT = range(4)
|
||||
|
||||
DOWNLOAD_DESTDIR = os.path.expanduser('~/bin')
|
||||
|
||||
class Bintool:
|
||||
"""Tool which operates on binaries to help produce entry contents
|
||||
|
||||
@@ -53,6 +51,9 @@ class Bintool:
|
||||
# List of bintools to regard as missing
|
||||
missing_list = []
|
||||
|
||||
# Directory to store tools
|
||||
tooldir = os.path.join(os.getenv('HOME'), 'bin')
|
||||
|
||||
def __init__(self, name, desc, version_regex=None, version_args='-V'):
|
||||
self.name = name
|
||||
self.desc = desc
|
||||
@@ -208,7 +209,7 @@ class Bintool:
|
||||
return FAIL
|
||||
if result is not True:
|
||||
fname, tmpdir = result
|
||||
dest = os.path.join(DOWNLOAD_DESTDIR, self.name)
|
||||
dest = os.path.join(self.tooldir, self.name)
|
||||
print(f"- writing to '{dest}'")
|
||||
shutil.move(fname, dest)
|
||||
if tmpdir:
|
||||
|
Reference in New Issue
Block a user