From owner-freebsd-current@FreeBSD.ORG Thu Oct 20 12:21:23 2011 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3808106566B for ; Thu, 20 Oct 2011 12:21:22 +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 6C0A88FC16 for ; Thu, 20 Oct 2011 12:21:22 +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 p9KCLLT5074722 for ; Thu, 20 Oct 2011 05:21:21 -0700 (PDT) (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.14.5/8.14.5/Submit) id p9KCLL5T074721 for current@freebsd.org; Thu, 20 Oct 2011 05:21:21 -0700 (PDT) (envelope-from david) Date: Thu, 20 Oct 2011 05:21:21 -0700 From: David Wolfskill To: current@freebsd.org Message-ID: <20111020122121.GL59810@albert.catwhisker.org> Mail-Followup-To: David Wolfskill , current@freebsd.org References: <20111020114844.GK59810@albert.catwhisker.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OQhbRXNHSL5w/5po" Content-Disposition: inline In-Reply-To: <20111020114844.GK59810@albert.catwhisker.org> User-Agent: Mutt/1.4.2.3i Cc: Subject: Re: sys/conf/newvers.sh vs. subversion-1.7 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2011 12:21:23 -0000 --OQhbRXNHSL5w/5po Content-Type: multipart/mixed; boundary="fDERRRNgB4on1jOB" Content-Disposition: inline --fDERRRNgB4on1jOB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=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. > ... 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: We= d Oct 19 05:22:52 PDT 2011 root@freebeast.catwhisker.org:/usr/obj/usr/s= rc/sys/GENERIC i386 FreeBSD freebeast.catwhisker.org 10.0-CURRENT FreeBSD 10.0-CURRENT #626 r22= 6563M: Thu Oct 20 05:04:03 PDT 2011 root@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 --=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. --fDERRRNgB4on1jOB Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="newvers.diff" Content-Transfer-Encoding: quoted-printable 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 226563) +++ 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" -a -x "${dir}/svnversion" ] ; then svnversion=3D${dir}/svnversion break fi --fDERRRNgB4on1jOB-- --OQhbRXNHSL5w/5po Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk6gEkEACgkQmprOCmdXAD0vaACdEfqboEEqDoL5GgMQdBM+SzL4 hegAnjyDVUbDX3CKaWK++k6Rq7r3Tdt2 =x7El -----END PGP SIGNATURE----- --OQhbRXNHSL5w/5po--