Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-18 23:19:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'patman' of git://git.denx.de/u-boot-x86

Browse source
This commit is contained in:
Tom Rini 2013-05-09 21:04:32 -04:00
commit 2988eac70e
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/buildman/control.py
View file

@ -137,6 +137,11 @@ def DoBuildman(options, args):
upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch) upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch)
series = patchstream.GetMetaDataForList(upstream_commit, options.git_dir, series = patchstream.GetMetaDataForList(upstream_commit, options.git_dir,
1) 1)
# 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 = patchstream.GetMetaDataForList(range_expr, options.git_dir, None,
series) series)

2
tools/patman/patman.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python
# #
# Copyright (c) 2011 The Chromium OS Authors. # Copyright (c) 2011 The Chromium OS Authors.
# #

4
tools/patman/series.py
View file

@ -40,6 +40,7 @@ class Series(dict):
notes: List of lines in the notes notes: List of lines in the notes
changes: (dict) List of changes for each version, The key is changes: (dict) List of changes for each version, The key is
the integer version number the integer version number
allow_overwrite: Allow tags to overwrite an existing tag
""" """
def __init__(self): def __init__(self):
self.cc = [] self.cc = []
@ -49,6 +50,7 @@ class Series(dict):
self.cover = None self.cover = None
self.notes = [] self.notes = []
self.changes = {} self.changes = {}
self.allow_overwrite = False
# Written in MakeCcFile() # Written in MakeCcFile()
# key: name of patch file # key: name of patch file
@ -72,7 +74,7 @@ class Series(dict):
""" """
# If we already have it, then add to our list # If we already have it, then add to our list
name = name.replace('-', '_') name = name.replace('-', '_')
if name in self: if name in self and not self.allow_overwrite:
values = value.split(',') values = value.split(',')
values = [str.strip() for str in values] values = [str.strip() for str in values]
if type(self[name]) != type([]): if type(self[name]) != type([]):