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 r...@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 r...@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. Peace, david -- David H. Wolfskill da...@catwhisker.org Depriving a girl or boy of an opportunity for education is evil. See http://www.catwhisker.org/~david/publickey.gpg for my public key.
Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh (revision 226563)
+++ sys/conf/newvers.sh (working copy)
@@ -88,7 +88,7 @@
i=`${MAKE:-make} -V KERN_IDENT`
for dir in /bin /usr/bin /usr/local/bin; do
- if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
+ if [ -d "${SYSDIR}/../.svn" -a -x "${dir}/svnversion" ] ; then
svnversion=${dir}/svnversion
break
fi
pgpuZUWpNnTMD.pgp
Description: PGP signature
