From owner-freebsd-current@FreeBSD.ORG Fri Oct 21 21:05:14 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 675E6106566B; Fri, 21 Oct 2011 21:05:14 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 3D5C68FC21; Fri, 21 Oct 2011 21:05:14 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id EA46546B0C; Fri, 21 Oct 2011 17:05:13 -0400 (EDT) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 8AA128A037; Fri, 21 Oct 2011 17:05:13 -0400 (EDT) From: John Baldwin To: freebsd-current@freebsd.org Date: Fri, 21 Oct 2011 16:36:05 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110617; KDE/4.5.5; amd64; ; ) References: <20111020114844.GK59810@albert.catwhisker.org> <20111020122121.GL59810@albert.catwhisker.org> In-Reply-To: <20111020122121.GL59810@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201110211636.05917.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Fri, 21 Oct 2011 17:05:13 -0400 (EDT) Cc: 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 List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Oct 2011 21:05:14 -0000 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@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@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