Author: dougb
Date: Fri Nov 18 20:51:31 2011
New Revision: 227678
URL: http://svn.freebsd.org/changeset/base/227678
Log:
MFC r226863:
Fix svnversion for svn 1.7.x by not looking for .svn in ${SYSDIR}
(since it no longer exists). Instead, run svnversion if we can find
the binary and test that the output looks like a version string.
Approved by: re (kib)
Modified:
releng/9.0/sys/conf/newvers.sh
Directory Properties:
releng/9.0/sys/ (props changed)
releng/9.0/sys/amd64/include/xen/ (props changed)
releng/9.0/sys/boot/ (props changed)
releng/9.0/sys/boot/i386/efi/ (props changed)
releng/9.0/sys/boot/ia64/efi/ (props changed)
releng/9.0/sys/boot/ia64/ski/ (props changed)
releng/9.0/sys/boot/powerpc/boot1.chrp/ (props changed)
releng/9.0/sys/boot/powerpc/ofw/ (props changed)
releng/9.0/sys/cddl/contrib/opensolaris/ (props changed)
releng/9.0/sys/conf/ (props changed)
releng/9.0/sys/contrib/dev/acpica/ (props changed)
releng/9.0/sys/contrib/octeon-sdk/ (props changed)
releng/9.0/sys/contrib/pf/ (props changed)
releng/9.0/sys/contrib/x86emu/ (props changed)
Modified: releng/9.0/sys/conf/newvers.sh
==============================================================================
--- releng/9.0/sys/conf/newvers.sh Fri Nov 18 20:47:14 2011
(r227677)
+++ releng/9.0/sys/conf/newvers.sh Fri Nov 18 20:51:31 2011
(r227678)
@@ -88,7 +88,7 @@ v=`cat version` u=${USER:-root} d=`pwd`
i=`${MAKE:-make} -V KERN_IDENT`
for dir in /bin /usr/bin /usr/local/bin; do
- if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
+ if [ -x "${dir}/svnversion" ] ; then
svnversion=${dir}/svnversion
break
fi
@@ -99,8 +99,12 @@ for dir in /bin /usr/bin /usr/local/bin;
done
if [ -n "$svnversion" ] ; then
- echo "$svnversion"
- svn=" r`cd ${SYSDIR} && $svnversion`"
+ echo "$svnversion"
+ svn=`cd ${SYSDIR} && $svnversion`
+ case "$svn" in
+ [0-9]*) svn=" r${svn}" ;;
+ *) unset svn ;;
+ esac
fi
if [ -n "$git_cmd" ] ; then
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
