upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

MFC r196435:

Browse source 
The svnversion string is only relevant when newvers.sh is called
during the kernel build process, the other places that call the
script do not make use of that information. So restrict execution
of the svnversion-related code to the kernel build context.

Approved by:	re (kib)
This commit is contained in:
Doug Barton 2009-08-26 22:32:14 +00:00
parent 0c4ef85bfd
commit 818b5b0e2a
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sys/conf/newvers.sh
View file

@ -87,29 +87,25 @@ touch version
v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
i=`${MAKE:-make} -V KERN_IDENT`
for dir in /bin /usr/bin /usr/local/bin; do
if [ -x "${dir}/svnversion" ]; then
svnversion=${dir}/svnversion
SRCDIR=${d##*obj}
if [ -n "$MACHINE" ]; then
SRCDIR=${SRCDIR##/$MACHINE}
case "$d" in
*/sys/*)
for dir in /bin /usr/bin /usr/local/bin; do
if [ -x "${dir}/svnversion" ]; then
svnversion=${dir}/svnversion
SRCDIR=${d##*obj}
if [ -n "$MACHINE" ]; then
SRCDIR=${SRCDIR##/$MACHINE}
fi
SRCDIR=${SRCDIR%%/sys/*}
break
fi
SRCDIR=${SRCDIR%%/sys/*}
break
fi
done
done
if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then
# If we are called from the kernel build, limit
# the scope of svnversion to sys/ .
if [ -e "${SRCDIR}/sys/conf/newvers.sh" ] ; then
svn=" r`cd $SRCDIR/sys && $svnversion`"
else
svn=" r`cd $SRCDIR && $svnversion`"
if [ -n "$svnversion" -a -d "${SRCDIR}/sys/.svn" ] ; then
svn=" r`cd ${SRCDIR}/sys && $svnversion`"
fi
else
svn=""
fi
;;
esac
cat << EOF > vers.c
$COPYRIGHT