From owner-freebsd-stable@FreeBSD.ORG Tue Apr 23 00:38:12 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4762E398 for ; Tue, 23 Apr 2013 00:38:12 +0000 (UTC) (envelope-from jdc@koitsu.org) Received: from qmta09.emeryville.ca.mail.comcast.net (qmta09.emeryville.ca.mail.comcast.net [IPv6:2001:558:fe2d:43:76:96:30:96]) by mx1.freebsd.org (Postfix) with ESMTP id 2CDCC1FB4 for ; Tue, 23 Apr 2013 00:38:12 +0000 (UTC) Received: from omta15.emeryville.ca.mail.comcast.net ([76.96.30.71]) by qmta09.emeryville.ca.mail.comcast.net with comcast id TCSP1l0021Y3wxoA9CeBuZ; Tue, 23 Apr 2013 00:38:11 +0000 Received: from koitsu.strangled.net ([67.180.84.87]) by omta15.emeryville.ca.mail.comcast.net with comcast id TCeA1l00Q1t3BNj8bCeBPT; Tue, 23 Apr 2013 00:38:11 +0000 Received: by icarus.home.lan (Postfix, from userid 1000) id CC96973A1B; Mon, 22 Apr 2013 17:38:10 -0700 (PDT) Date: Mon, 22 Apr 2013 17:38:10 -0700 From: Jeremy Chadwick To: Glen Barber Subject: Re: svn revision stable/9 Message-ID: <20130423003810.GA18488@icarus.home.lan> References: <000901ce3fb3$31732a50$94597ef0$@gmail.com> <20130423000004.GA17734@icarus.home.lan> <20130423000602.GB1606@glenbarber.us> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130423000602.GB1606@glenbarber.us> User-Agent: Mutt/1.5.21 (2010-09-15) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1366677491; bh=v/+r2Kel+FVKFMqZHYxOeV88BONHutF4E4dn1iS+sUs=; h=Received:Received:Received:Date:From:To:Subject:Message-ID: MIME-Version:Content-Type; b=LMMQr1+DXiM5zwQkxbMYRIzuHYjId9CW3VuKQpcb+/lJZuqc1Pfdpr1jUMyde0qZu UcJ5qFQXtIQBlxTyT/fYDkm16vc9yKL7JOAisWJ20qyt7oTV/fhZJYVGIVRySpJBVd 8cAhRGFxH3+pd47eb+cB0xvJ9S7q570frmyz5dRggovQf3T3VBV9NoPSJC06xLI/b7 GI78cRbHB8nbeVzIoW9UKHRSO505mZJUtwBWyJE5e2IvcORuECIDDfI1aUZqtGeI80 xJ0j9/ljB84MVbnlwXi9zdhgD/eP18f2OO0zlVYMCNMAdLwBrBgYK95eZcNZCZQmnA WW3TvAsta+tQg== Cc: Scott Reber , freebsd-stable@freebsd.org, John Mehr X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2013 00:38:12 -0000 On Mon, Apr 22, 2013 at 08:06:02PM -0400, Glen Barber wrote: > On Mon, Apr 22, 2013 at 05:00:04PM -0700, Jeremy Chadwick wrote: > > I'm not sure where this comes from during buildkernel, however. "svn > > info" is the way I know of to get that value, but I don't know where in > > the build framework it obtains this number. > > > > svnversion is called in sys/conf/newvers.sh to get the revision. > > > The reason I mention that: possibly the build framework uses the "svn" > > command to get the information, and since "svnup" is not "svn", it can't > > get it, thus there's nothing to print. > > > > svnversion is the specific binary that is required, but svnup does not > pull in metadata. As always, thanks for the insights Glen -- that was the piece I was looking for. :-) John Mehr might be able to comment on this, but here's an idea (stated with zero knowledge of, well, pretty much anything!): Depending on what all goes on within svnup (and what the SVN protocol offers), is it possible for svnup to pull down a revision number and store it somewhere (ex. /var/db/svnup-revision would contain rXXXXXX), then as part of the svnup package/suite, have a shell script called "svnversion" that simply provides the content of that file? That looks like it'd be compatible with sys/conf/newvers.sh, which does: 91 for dir in /bin /usr/bin /usr/local/bin; do 92 if [ -x "${dir}/svnversion" ] ; then 93 svnversion=${dir}/svnversion 94 break 95 fi 96 done ... 106 if [ -n "$svnversion" ] ; then 107 echo "$svnversion" 108 svn=`cd ${SYSDIR} && $svnversion` 109 case "$svn" in 110 [0-9]*) svn=" r${svn}" ;; 111 *) unset svn ;; 112 esac 113 fi Naturally the svnup port would need to have a CONFLICTS line added, since having both svnup and subversion installed on the same machine would result in a /usr/local/bin/svnversion conflict. -- | Jeremy Chadwick jdc@koitsu.org | | UNIX Systems Administrator http://jdc.koitsu.org/ | | Mountain View, CA, US | | Making life hard for others since 1977. PGP 4BD6C0CB |