diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-13 09:01:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-13 09:01:01 -0400 |
| commit | f9e3d2e147ee3b18dbc09e56d13e6fc8758ac375 (patch) | |
| tree | bd93f43be8a3ea14724aeb5686fbdcb80125623e /tools/buildman/builder.py | |
| parent | 8a1292ce3e21205645a155b23ac083a3fc6b64c1 (diff) | |
| parent | cea8f2c995b9d87af6ef42f967402e1c8a3506db (diff) | |
Merge tag 'dm-pull-12jun20' of git://git.denx.de/u-boot-dm into next
patman improvements to allow it to work with Zephyr
change to how sequence numbers are assigned to devices
minor fixes and improvements
Diffstat (limited to 'tools/buildman/builder.py')
| -rw-r--r-- | tools/buildman/builder.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index f8e71de4272..f2756ea6665 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -70,12 +70,12 @@ As an example, say we are building branch 'us-net' for boards 'sandbox' and like this: us-net/ base directory - 01_of_02_g4ed4ebc_net--Add-tftp-speed-/ + 01_g4ed4ebc_net--Add-tftp-speed-/ sandbox/ u-boot.bin seaboard/ u-boot.bin - 02_of_02_g4ed4ebc_net--Check-tftp-comp/ + 02_g4ed4ebc_net--Check-tftp-comp/ sandbox/ u-boot.bin seaboard/ @@ -487,8 +487,8 @@ class Builder: commit = self.commits[commit_upto] subject = commit.subject.translate(trans_valid_chars) # See _GetOutputSpaceRemovals() which parses this name - commit_dir = ('%02d_of_%02d_g%s_%s' % (commit_upto + 1, - self.commit_count, commit.hash, subject[:20])) + commit_dir = ('%02d_g%s_%s' % (commit_upto + 1, + commit.hash, subject[:20])) elif not self.no_subdirs: commit_dir = 'current' if not commit_dir: @@ -1599,7 +1599,7 @@ class Builder: for dirname in glob.glob(os.path.join(self.base_dir, '*')): if dirname not in dir_list: leaf = dirname[len(self.base_dir) + 1:] - m = re.match('[0-9]+_of_[0-9]+_g[0-9a-f]+_.*', leaf) + m = re.match('[0-9]+_g[0-9a-f]+_.*', leaf) if m: to_remove.append(dirname) return to_remove |