d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to r197433, the more recent change doesn't work for the common

Browse Source 
case, and has not been well received.
This commit is contained in:
Doug Barton 2010-03-10 01:00:37 +00:00
parent 8c04d588c5
commit d09d3ccb14
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/conf/newvers.sh
View File

@ -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`