From owner-cvs-src@FreeBSD.ORG Fri Aug 1 10:05:27 2008 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7C7391065671; Fri, 1 Aug 2008 10:05:27 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from igloo.linux.gr (igloo.linux.gr [62.1.205.36]) by mx1.freebsd.org (Postfix) with ESMTP id E097F8FC08; Fri, 1 Aug 2008 10:05:26 +0000 (UTC) (envelope-from keramida@freebsd.org) Received: from kobe.laptop (adsl151-101.kln.forthnet.gr [62.1.242.101]) (authenticated bits=128) by igloo.linux.gr (8.14.3/8.14.3/Debian-5) with ESMTP id m719rnB4008086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 1 Aug 2008 12:53:55 +0300 Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.2/8.14.2) with ESMTP id m719rnAm026797; Fri, 1 Aug 2008 12:53:49 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from keramida@localhost) by kobe.laptop (8.14.2/8.14.2/Submit) id m719rm2h026796; Fri, 1 Aug 2008 12:53:48 +0300 (EEST) (envelope-from keramida@freebsd.org) From: Giorgos Keramidas To: Doug Barton References: <200807161029.m6GATt4V031164@repoman.freebsd.org> Date: Fri, 01 Aug 2008 12:53:48 +0300 In-Reply-To: <200807161029.m6GATt4V031164@repoman.freebsd.org> (Doug Barton's message of "Wed, 16 Jul 2008 10:29:42 +0000 (UTC)") Message-ID: <87ej59kqmr.fsf@kobe.laptop> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-MailScanner-ID: m719rnB4008086 X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-4.673, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL -0.27, BAYES_00 -2.60) X-Hellug-MailScanner-From: keramida@freebsd.org X-Spam-Status: No Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/conf newvers.sh X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Aug 2008 10:05:27 -0000 On Wed, 16 Jul 2008 10:29:42 +0000 (UTC), Doug Barton 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="" %%%