From owner-freebsd-current@FreeBSD.ORG Tue Oct 25 14:00:01 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 744541065677; Tue, 25 Oct 2011 14:00:01 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (m209-73.dsl.rawbw.com [198.144.209.73]) by mx1.freebsd.org (Postfix) with ESMTP id 237418FC17; Tue, 25 Oct 2011 14:00:00 +0000 (UTC) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.14.5/8.14.5) with ESMTP id p9PE00hL008671; Tue, 25 Oct 2011 07:00:00 -0700 (PDT) (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.14.5/8.14.5/Submit) id p9PE00gR008670; Tue, 25 Oct 2011 07:00:00 -0700 (PDT) (envelope-from david) Date: Tue, 25 Oct 2011 07:00:00 -0700 From: David Wolfskill To: John Baldwin Message-ID: <20111025140000.GA8559@albert.catwhisker.org> References: <20111020114844.GK59810@albert.catwhisker.org> <20111020122121.GL59810@albert.catwhisker.org> <201110211636.05917.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="VS++wcV0S1rZb1Fb" Content-Disposition: inline In-Reply-To: <201110211636.05917.jhb@freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: freebsd-current@freebsd.org Subject: Re: sys/conf/newvers.sh vs. subversion-1.7 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: current@freebsd.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Oct 2011 14:00:01 -0000 --VS++wcV0S1rZb1Fb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Oct 21, 2011 at 04:36:05PM -0400, John Baldwin 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. > > >=20 > > > 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.... :-} > > >=20 > > > It might be handy to resolve this prior to 9.0-RELEASE, I think. > > > ... > ... > Hmm, that won't always work, the problem is if someone just checks out a= =20 > kernel tree then .svn will be in SYSDIR. Alternatively, if you have a tr= ee=20 > like mine which has work/freebsd/svn/ with various subdirs (head/, stable= /=20 > with subdirs for 7, 8, 9) but all rooted at the upperlevel, just looking = two=20 > levels up won't work. OK... How about (untested) something like: Index: sys/conf/newvers.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/conf/newvers.sh (revision 226724) +++ sys/conf/newvers.sh (working copy) @@ -88,7 +88,7 @@ i=3D`${MAKE:-make} -V KERN_IDENT` =20 for dir in /bin /usr/bin /usr/local/bin; do - if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then + if [ ( -d "${SYSDIR}/.svn" -o -d "${SYSDIR}/../.svn" ) -a -x "${dir}/svnv= ersion" ] ; then svnversion=3D${dir}/svnversion break fi then? That should preserve current behavior for the case you & Jilles expressed concern about, while repairing the currently-broken default case. I believe it's in the interest of the project to have that default case working again (at least) in time for 9.0-RELEASE. Please. > .... I'm staying out of the "svnversion vs. svn info" branch of the thread. Peace, david --=20 David H. Wolfskill david@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. --VS++wcV0S1rZb1Fb Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk6mwN8ACgkQmprOCmdXAD0J3QCfZ9jBdAwMpeqfa++MvnDKpLK6 pY8Ani2IdkwZ0dIGhfjirpdEEwajsU05 =KfxJ -----END PGP SIGNATURE----- --VS++wcV0S1rZb1Fb--