Author: dougb
Date: Wed Mar 10 01:00:37 2010
New Revision: 204937
URL: http://svn.freebsd.org/changeset/base/204937
Log:
Revert to r197433, the more recent change doesn't work for the common
case, and has not been well received.
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh Wed Mar 10 00:47:09 2010 (r204936)
+++ head/sys/conf/newvers.sh Wed Mar 10 01:00:37 2010 (r204937)
@@ -88,15 +88,15 @@ v=`cat version` u=${USER:-root} d=`pwd`
i=`${MAKE:-make} -V KERN_IDENT`
case "$d" in
-*/compile/*)
+*/sys/*)
SRCDIR=${d##*obj}
if [ -n "$MACHINE" ]; then
SRCDIR=${SRCDIR##/$MACHINE}
fi
- SRCDIR=$(cd ${SRCDIR%%/compile/*}/.. && pwd)
+ SRCDIR=${SRCDIR%%/sys/*}
for dir in /bin /usr/bin /usr/local/bin; do
- if [ -d "${SRCDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
+ if [ -d "${SRCDIR}/sys/.svn" -a -x "${dir}/svnversion" ] ; then
svnversion=${dir}/svnversion
break
fi
@@ -107,7 +107,7 @@ case "$d" in
done
if [ -n "$svnversion" ] ; then
- svn=" r`cd ${SRCDIR} && $svnversion`"
+ svn=" r`cd ${SRCDIR}/sys && $svnversion`"
fi
if [ -n "$git_cmd" ] ; then
git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null`
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
