summaryrefslogtreecommitdiff
path: root/tools/buildman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-05 19:00:23 -0600
committerSimon Glass <sjg@chromium.org>2014-09-09 16:38:31 -0600
commit950a23133d8235778ea29f5d9587edec7d9bbc0a (patch)
tree5db30378cf951577c252f4c4b698d5f55381f488 /tools/buildman
parentf7582ce8496f19edf845d1f62c4b7f385e4cd864 (diff)
downloadu-boot-imx-950a23133d8235778ea29f5d9587edec7d9bbc0a.zip
u-boot-imx-950a23133d8235778ea29f5d9587edec7d9bbc0a.tar.gz
u-boot-imx-950a23133d8235778ea29f5d9587edec7d9bbc0a.tar.bz2
buildman: Ignore conflicting tags
Tags like Series-version are normally expected to appear once, and with a unique value. But buildman doesn't actually look at these tags. So ignore conflicts. This allows bulidman to build a branch containing multiple patman series. Reported-by: Steve Rae <srae@broadcom.com> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/buildman')
-rw-r--r--tools/buildman/control.py15
-rw-r--r--tools/buildman/func_test.py3
2 files changed, 10 insertions, 8 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 8146e1c..e97350f 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -166,6 +166,10 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
# upstream/master~..branch but that isn't possible if upstream/master is
# a merge commit (it will list all the commits that form part of the
# merge)
+ # Conflicting tags are not a problem for buildman, since it does not use
+ # them. For example, Series-version is not useful for buildman. On the
+ # other hand conflicting tags will cause an error. So allow later tags
+ # to overwrite earlier ones by setting allow_overwrite=True
if options.branch:
if count == -1:
range_expr = gitutil.GetRangeInBranch(options.git_dir,
@@ -173,19 +177,14 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
upstream_commit = gitutil.GetUpstream(options.git_dir,
options.branch)
series = patchstream.GetMetaDataForList(upstream_commit,
- options.git_dir, 1)
+ options.git_dir, 1, series=None, allow_overwrite=True)
- # Conflicting tags are not a problem for buildman, since it does
- # not use them. For example, Series-version is not useful for
- # buildman. On the other hand conflicting tags will cause an
- # error. So allow later tags to overwrite earlier ones.
- series.allow_overwrite = True
series = patchstream.GetMetaDataForList(range_expr,
- options.git_dir, None, series)
+ options.git_dir, None, series, allow_overwrite=True)
else:
# Honour the count
series = patchstream.GetMetaDataForList(options.branch,
- options.git_dir, count)
+ options.git_dir, count, series=None, allow_overwrite=True)
else:
series = None
options.verbose = True
diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py
index c37f1b6..75eb3a9 100644
--- a/tools/buildman/func_test.py
+++ b/tools/buildman/func_test.py
@@ -79,6 +79,7 @@ Date: Thu Aug 14 16:48:25 2014 -0600
Series-changes: 7
- Add new patch to fix the 'reverse' bug
+ Series-version: 8
Change-Id: I79078f792e8b390b8a1272a8023537821d45feda
Reported-by: York Sun <yorksun@freescale.com>
@@ -156,6 +157,8 @@ Date: Fri Aug 22 15:57:39 2014 -0600
Series-changes: 9
- Add new patch to avoid changing the order of tags
+ Series-version: 9
+
Suggested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Change-Id: Ib1518588c1a189ad5c3198aae76f8654aed8d0db
"""]