diff options
author | Tom Rini <trini@konsulko.com> | 2020-04-28 16:52:01 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-04-28 16:52:01 +0300 |
commit | 545c747447706d9601cc5c65a85ec44e688bfe08 (patch) | |
tree | 398a874161673df9656e271a6dbb4b127a45f725 /tools/buildman/builder.py | |
parent | 08977f873f4034307796173784fc17a11188a0cb (diff) | |
parent | c1f39edc62adc81775e750957aa557bcf994e607 (diff) | |
download | u-boot-545c747447706d9601cc5c65a85ec44e688bfe08.tar.xz |
Merge tag 'dm-pull-27apr20' of git://git.denx.de/u-boot-dm
Move Python tools to use absolute paths
Minor buildman fixes for new features
Make libfdt code more similar to upsteam
Diffstat (limited to 'tools/buildman/builder.py')
-rw-r--r-- | tools/buildman/builder.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 30ebe1d820..f8e71de427 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -17,12 +17,12 @@ import sys import threading import time -import builderthread -import command -import gitutil -import terminal -from terminal import Print -import toolchain +from buildman import builderthread +from buildman import toolchain +from patman import command +from patman import gitutil +from patman import terminal +from patman.terminal import Print """ Theory of Operation @@ -479,6 +479,9 @@ class Builder: Args: commit_upto: Commit number to use (0..self.count-1) """ + if self.work_in_output: + return self._working_dir + commit_dir = None if self.commits: commit = self.commits[commit_upto] @@ -502,6 +505,8 @@ class Builder: target: Target name """ output_dir = self._GetOutputDir(commit_upto) + if self.work_in_output: + return output_dir return os.path.join(output_dir, target) def GetDoneFile(self, commit_upto, target): |