Date: Sun, 8 Jun 2008 19:46:23 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/conf newvers.sh Message-ID: <200806081946.m58JkQLR076605@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806081946.m58JkQLR076605>