diff options
| author | dougb <dougb@FreeBSD.org> | 2010-03-10 01:00:37 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-03-10 01:00:37 +0000 |
| commit | e9f05740bf83ffacf5d4c8258e83c33c8465bf03 (patch) | |
| tree | 78b86fdb3642a7724ad0ba09bc12c7cf5794459e /sys/conf/newvers.sh | |
| parent | 61ea4dafc769f8e55800d8b449032b42858bf2c2 (diff) | |
| download | FreeBSD-src-e9f05740bf83ffacf5d4c8258e83c33c8465bf03.zip FreeBSD-src-e9f05740bf83ffacf5d4c8258e83c33c8465bf03.tar.gz | |
Revert to r197433, the more recent change doesn't work for the common
case, and has not been well received.
Diffstat (limited to 'sys/conf/newvers.sh')
| -rw-r--r-- | sys/conf/newvers.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d786210..cabee5a 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -88,15 +88,15 @@ v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date` 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` |
