From owner-cvs-all@FreeBSD.ORG  Sun Jun  8 19:46:27 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 47D8E1065748;
	Sun,  8 Jun 2008 19:46:26 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 97DE58FC1C;
	Sun,  8 Jun 2008 19:46:26 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m58JkQ67076606;
	Sun, 8 Jun 2008 19:46:26 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m58JkQLR076605;
	Sun, 8 Jun 2008 19:46:26 GMT
	(envelope-from dougb@repoman.freebsd.org)
Message-Id: <200806081946.m58JkQLR076605@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	dougb@repoman.freebsd.org using -f
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 8 Jun 2008 19:46:23 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/conf newvers.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jun 2008 19:46:27 -0000

dougb       2008-06-08 19:46:23 UTC

  FreeBSD src repository

  Modified files:
    sys/conf             newvers.sh 
  Log:
  SVN rev 179655 on 2008-06-08 19:46:23Z by dougb
  
  The change to add subversion ID has two problems. The first is that when
  newvers.sh is run pwd is actually the obj directory, so "../../.svn"
  doesn't exist and the test always fails. The second is that buildkernel
  is executed with a restrictive PATH, so unless you have svnversion in
  /bin or /usr/bin it can't run.
  
  Fix this by looking for svnversion in /bin, /usr/bin, and /usr/local/bin
  in that order. If found, store the location and derive the value of the
  source directory. Then run svnversion in the appropriate directory.
  
  There is one possible refinement which would be to add a test for
  LOCALBASE!=/usr/local if we don't find svnversion the first time, but
  IMO that's not necessary at this time.
  
  Revision  Changes    Path
  1.75      +11 -2     src/sys/conf/newvers.sh