Re: sys/conf/newvers.sh vs. subversion-1.7

On Thursday, October 20, 2011 8:21:21 am David Wolfskill wrote:
> On Thu, Oct 20, 2011 at 04:48:44AM -0700, David Wolfskill wrote:
> > ...
> > Well, as of subversion-1.7, we don't have a ".svn" directory in
> > ${SYSDIR} any more -- it's only at the root of the working copy
> > (/usr/src, in this case).  So "svnversion" is never invoked.
> > 
> > So I've just hacked my copy to parallel the "git" stanza & look for
> > ${SYSDIR}/../.svn,  Not sure that's ideal, but there appears to be
> > precedent.... :-}
> > 
> > It might be handy to resolve this prior to 9.0-RELEASE, I think.
> > ...
> 
> Finished building head, and the change worked; here are uname strings
> from yesterday & today:
> 
> FreeBSD freebeast.catwhisker.org 10.0-CURRENT FreeBSD 10.0-CURRENT #625: Wed 
Oct 19 05:22:52 PDT 2011     
root_at_freebeast.catwhisker.org:/usr/obj/usr/src/sys/GENERIC  i386
> 
> FreeBSD freebeast.catwhisker.org 10.0-CURRENT FreeBSD 10.0-CURRENT #626 
r226563M: Thu Oct 20 05:04:03 PDT 2011     
root_at_freebeast.catwhisker.org:/usr/obj/usr/src/sys/GENERIC  i386
> 
> I've attached a copy of the patch, in case my description wasn't
> clear.  And I'll plan on filing a PR a bit later today.

Hmm, that won't always work, the problem is if someone just checks out a 
kernel tree then .svn will be in SYSDIR.  Alternatively, if you have a tree 
like mine which has work/freebsd/svn/ with various subdirs (head/, stable/ 
with subdirs for 7, 8, 9) but all rooted at the upperlevel, just looking two 
levels up won't work.

I'm not sure what the best fix is.  One could possibly always run svnversion 
if it exists?

-- 
John Baldwin