From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Rae Date: Thu, 28 Aug 2014 10:21:47 -0700 Subject: [U-Boot] buildman: suspect issue with patman tags In-Reply-To: References: <53FE4BFF.4070001@broadcom.com> Message-ID: <53FF652B.6040000@broadcom.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 14-08-28 07:45 AM, Simon Glass wrote: > Hi Steve, > > On 27 August 2014 15:22, Steve Rae wrote: [... snip ...] >> >> *From:*Steve Rae >> *Sent:* Monday, August 25, 2014 09:06 >> *To:* Simon Glass >> *Subject:* buildman: issue with patman tags >> >> Simon, >> >> When I combine multiple patch-series, each with their own patman tags in the >> commit messages, into a single branch... >> >> Then: >> >> $ tools/buildman/buildman -b combined bcm28155_ap >> No section: 'make-flags' >> Traceback (most recent call last): >> File "tools/buildman/buildman", line 139, in >> control.DoBuildman(options, args) >> File "/home/srae/work/to_denx/tools/buildman/control.py", line 161, >> in DoBuildman >> options.git_dir, count) >> File >> "/home/srae/work/to_denx/tools/buildman/../patman/patchstream.py", line >> 387, in GetMetaDataForList >> ps.ProcessLine(line) >> File >> "/home/srae/work/to_denx/tools/buildman/../patman/patchstream.py", line >> 248, in ProcessLine >> self.AddToSeries(line, name, value) >> File >> "/home/srae/work/to_denx/tools/buildman/../patman/patchstream.py", line >> 94, in AddToSeries >> self.series.AddTag(self.commit, line, name, value) >> File "/home/srae/work/to_denx/tools/buildman/../patman/series.py", >> line 67, in AddTag >> (commit.hash, line, values, self[name])) >> ValueError: In 442a87cd: line 'Series-version: 1': Cannot add another >> value '['1']' to series '4' >> $ >> >> Note: each patch-series individually build successfully with buildman, >> it is only after I combine that there are issues.... > > This is because buildman doesn't need these tags. For patman you need > to work with one series at a time. If you have multiple series, then > some might be at one version and some at another, and it wouldn't know > what version to put on the patch. Also there might be multiple cover > letters, etc. > > If you want to keep several series in a branch, you need to use -s and > -c to control what portion of the branch represents each series. Yes, I am successfully using these flags in patman; but I want to be able to build all the combined patches... > > I have thought about adding support for multiple series in a branch - > e.g. a marker on the bottom commit, giving each series a name. But I > haven't convinced myself it is desirable. That might be too complicated... Maybe just add a flag (in buildman) to simply ignore all of the commit messages (or ignore the patman tags in the commit messages) just so that the build would execute. Actually, the only think that I really need is to be able to build the last one (but I think that "--step=0" is close enough) > >> >> Thanks, Steve > > Regards, > Simon >