Date: Fri, 01 Aug 2008 12:53:48 +0300 From: Giorgos Keramidas <keramida@freebsd.org> To: Doug Barton <dougb@freebsd.org> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/conf newvers.sh Message-ID: <87ej59kqmr.fsf@kobe.laptop> In-Reply-To: <200807161029.m6GATt4V031164@repoman.freebsd.org> (Doug Barton's message of "Wed, 16 Jul 2008 10:29:42 %2B0000 (UTC)") References: <200807161029.m6GATt4V031164@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 16 Jul 2008 10:29:42 +0000 (UTC), Doug Barton <dougb@freebsd.org> wrote:
> dougb 2008-07-16 10:29:42 UTC
>
> FreeBSD src repository
>
> Modified files: (Branch: RELENG_6)
> sys/conf newvers.sh
> Log:
> SVN rev 180557 on 2008-07-16 10:29:42Z by dougb
>
> MFC r179637, r179655, and r180503, the inclusion of the svnversion info
> for uname.
>
> Revision Changes Path
> 1.69.2.17 +18 -2 src/sys/conf/newvers.sh
Hi Doug,
Instead of trying to guess ${SRCDIR} we could let make tell us its
value, at the last possible moment, by a patch like the one below.
Does it look like something we should commit?
%%%
diff -r fe80b79b9f0e sys/conf/kern.post.mk
--- a/sys/conf/kern.post.mk Fri Aug 01 02:48:36 2008 +0000
+++ b/sys/conf/kern.post.mk Fri Aug 01 12:50:18 2008 +0300
@@ -244,7 +244,7 @@
${NORMAL_LINT}
vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
- MAKE=${MAKE} sh $S/conf/newvers.sh ${KERN_IDENT}
+ MAKE=${MAKE} SRCDIR=$s sh $S/conf/newvers.sh ${KERN_IDENT}
vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c
diff -r fe80b79b9f0e sys/conf/newvers.sh
--- a/sys/conf/newvers.sh Fri Aug 01 02:48:36 2008 +0000
+++ b/sys/conf/newvers.sh Fri Aug 01 12:50:18 2008 +0300
@@ -90,13 +90,11 @@
for dir in /bin /usr/bin /usr/local/bin; do
if [ -x "${dir}/svnversion" ]; then
svnversion=${dir}/svnversion
- SRCDIR=${d##*obj}
- SRCDIR=${SRCDIR%%/sys/*}
break
fi
done
-if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then
+if [ -n "$svnversion" -a -n "${SRCDIR}" -a -d "${SRCDIR}/.svn" ] ; then
svn=" r`cd $SRCDIR && $svnversion`"
else
svn=""
%%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87ej59kqmr.fsf>