From d550032af9ec42c868a0a80dc6115e9392e893a7 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Thu, 24 Sep 2015 14:33:31 +0200 Subject: [PATCH 092/257] sys/conf/newvers.sh: Remove svn support (but keep 'git svn' support) Obtained from: ElectroBSD --- sys/conf/newvers.sh | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index c28bb4aeabba..8e2b1798228e 100755 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -128,31 +128,6 @@ else fi i=`${MAKE:-make} -V KERN_IDENT` -for dir in /usr/bin /usr/local/bin; do - if [ ! -z "${svnversion}" ] ; then - break - fi - if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then - # Run svnversion from ${dir} on this script; if return code - # is not zero, the checkout might not be compatible with the - # svnversion being used. - ${dir}/svnversion $(realpath ${0}) >/dev/null 2>&1 - if [ $? -eq 0 ]; then - svnversion=${dir}/svnversion - break - fi - fi -done - -if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then - /usr/bin/svnliteversion $(realpath ${0}) >/dev/null 2>&1 - if [ $? -eq 0 ]; then - svnversion=/usr/bin/svnliteversion - else - svnversion= - fi -fi - if [ -d "${SYSDIR}/../.git" ] ; then for dir in /usr/bin /usr/local/bin; do if [ -x "${dir}/git" ] ; then @@ -162,22 +137,6 @@ if [ -d "${SYSDIR}/../.git" ] ; then done fi -if [ -n "$svnversion" ] ; then - svn=`cd ${SYSDIR} && $svnversion 2>/dev/null` - case "$svn" in - [0-9]*[MSP]|*:*) - svn=" r${svn}" - modified=true - ;; - [0-9]*) - svn=" r${svn}" - ;; - *) - unset svn - ;; - esac -fi - if [ -n "$git_cmd" ] ; then git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null` svn=`$git_cmd svn find-rev $git 2>/dev/null` -- 2.11.0