Re: Dragonfly_Stable and newvers.sh

["Erik P. Skaalerud" <erik@xxxxxxxxxxxx>]

Erik P. Skaalerud wrote:
> Matthew Dillon wrote:
>
> > :I just rebuilt to latest Dragonfly_Stable tag, and I got a funny 
> > uname :output..
> > :
> > :[erik@dragon:~]$ uname -sr
> > :DragonFly 1.1-UNKNOWN
> > :
> > :Is it supposed to be like this?
> > :
> > :- Erik
> >
> >    Hmm.  The CVSROOT/config file in the cvs repository (if you are
> >    pulling down the repository) should have as the last line:
> >
> >    KeywordExpand=iDragonFly,Name
> >
> >    (verses just iDragonFly).
> >
> >    And the tag="\$Name:  $" line in /usr/src/sys/conf/newvers.sh 
> > should    be expanded out with the tag name, empty if HEAD.  If the 
> > tag field
> >    is "\$Name$" then it hasn't been expanded at all and there is a
> >    problem.
> >
> >    If your repository has the correct config line then try removing    
> > newvers.sh and cvs update'ing it again.  If your repository does not
> >    have the correct config line then the question is why doesn't it?  If
> >    you are pulling down the checked out source with cvsup then maybe
> >    cvsup is getting confused and not expanding the $Name$.
> >
> >                     -Matt
> >                     Matthew Dillon                     
> > <dillon@xxxxxxxxxxxxx>
> >  
> Hm.
>
> [root@dragon:/usr/mirror/cvsupd/prefixes/DragonFly.cvs/CVSROOT]$ cat config
> # $DragonFly: config,v 1.3 2004/10/22 23:21:00 dillon Exp $
>
> # Set this to "no" if pserver shouldn't check system users/passwords
> #SystemAuth=no
>
> # Put CVS lock files in this directory rather than directly in the 
> repository.
> #LockDir=/var/lock/cvs
>
> # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
> # level of the new working directory when using the `cvs checkout'
> # command.
> #TopLevelAdmin=no
>
> # Set `LogHistory' to `all' or `TOFEWGCMAR' to log all transactions to the
> # history file, or a subset as needed (ie `TMAR' logs all write operations)
> #LogHistory=TOFEWGCMAR
>
> # Set `RereadLogAfterVerify' to `always' (the default) to allow the 
> verifymsg
> # script to change the log message.  Set it to `stat' to force CVS to 
> verify# that the file has changed before reading it (this can take up to 
> an extra
> # second per directory being committed, so it is not recommended for large
> # repositories.  Set it to `never' (the previous CVS behavior) to prevent
> # verifymsg scripts from changing the log message.
> #RereadLogAfterVerify=always
>
> # Add the "DragonFly" keyword and restrict keyword expansion
> LocalKeyword=DragonFly=CVSHeader
> # The cvs guys did not add support for renaming other keywords, silly them!
> # So we have to enable Name in order for newvers.sh to be able to pick out
> # the tag being built
> KeywordExpand=iDragonFly,Name
> [root@dragon:/usr/mirror/cvsupd/prefixes/DragonFly.cvs/CVSROOT]$
>
>
> I cant see any errors.. Can you?
>
> - Erik

Matt, several people have reported the same behaviour. Is someone going 
to take a look?

- Erik