Date: Sun, 7 Mar 2010 17:01:25 -0800 From: "David O'Brien" <obrien@FreeBSD.org> To: "M. Warner Losh" <imp@bsdimp.com> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r204824 - head/sys/conf Message-ID: <20100308010125.GA6387@dragon.NUXI.org> In-Reply-To: <20100307.143619.510313205755027975.imp@bsdimp.com> References: <201003071008.o27A80wC014578@svn.freebsd.org> <20100307.143619.510313205755027975.imp@bsdimp.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Mar 07, 2010 at 02:36:19PM -0700, M. Warner Losh wrote:
> Please back out this change. It is unwise, I think.
Instead I'd rather fix it for the use case you mention.
---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%----
Index: newvers.sh
===================================================================
--- newvers.sh (revision 204851)
+++ newvers.sh (working copy)
@@ -87,13 +87,11 @@ touch version
v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
i=`${MAKE:-make} -V KERN_IDENT`
+# Are we doing a kernel build? Look for "/sys/" in pwd for 'make kernel',
+# and "/compile/" for tradiational within-tree kernel build.
case "$d" in
-*/compile/*)
- SRCDIR=${d##*obj}
- if [ -n "$MACHINE" ]; then
- SRCDIR=${SRCDIR##/$MACHINE}
- fi
- SRCDIR=$(cd ${SRCDIR%%/compile/*}/.. && pwd)
+*/sys/*|*/compile/*)
+ SRCDIR=$(realpath $(dirname $0)/..)
for dir in /bin /usr/bin /usr/local/bin; do
if [ -d "${SRCDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%---->%----
Do you get the subversion revision in your vers.c file with this patch?
--
-- David
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100308010125.GA6387>