On Wednesday 30 July 2008, Adam Jackson wrote:
On Wed, 2008-07-30 at 10:26 -0700, Toshio Kuratomi wrote:
> Adam Jackson wrote:
> > Attached are two (orthogonal) patches to make evaluation of
> > Makefile.common a bit faster.
> > The first one is possibly contentious. Currently, early-branching
> > works by checking for the existence of the other branch, by using 'cvs
> > rlog'. That kinda sucks, because it means you can't do 'make
> > while disconnected, and even when connected it's not fast. The patch
> > changes it to look for the package's name in a new file,
> > common/early-branched-packages. By keeping that file together with
> > Makefile.common we get pretty much the behaviour we're used to: when
> > build targets change, you have to update common/. Note that if we
> > apply this patch we will also need to create that (empty) file.
> > This would change the cvsadmin procedure for early branching, but
> > hopefully not by a burdensome amount.
> I'm against this one as it moves a kludge from Makefile.common into the
> scripts that handle branching. Can we achieve the same thing by keeping
> the information in the devel branch? For instance, each of the other
> branches has a branch file with the branch name inside. If devel did
> the same, could we alleviate this problem?
Sure. Makefile.common could parse the 'branch' file even for devel/,
and the magic word "early" or "rawhide" or something would mean
branch if that's an option, otherwise normal rawhide behaviour".
I don't have strong feelings about where the early-branch indicator
lives, as long as it's something I can know without asking the CVS
it should reference the line in branches that tells the Makefiles where to
build. this would require changes in the mass-branching, branching scripts
to make sure its right. but it should be workable. so when we start early
branching we will put F-11 in the branch file and add to branches in common
for knowing how to deal with F-11