Date: Thu, 20 Oct 2011 05:21:21 -0700 From: David Wolfskill <david@catwhisker.org> To: current@freebsd.org Subject: Re: sys/conf/newvers.sh vs. subversion-1.7 Message-ID: <20111020122121.GL59810@albert.catwhisker.org> In-Reply-To: <20111020114844.GK59810@albert.catwhisker.org> References: <20111020114844.GK59810@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111020122121.GL59810>