From owner-freebsd-embedded@FreeBSD.ORG Sun Aug 11 13:25:45 2013 Return-Path: Delivered-To: freebsd-embedded@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7F198A74; Sun, 11 Aug 2013 13:25:45 +0000 (UTC) (envelope-from mack@macktronics.com) Received: from borg.macktronics.com (borg.macktronics.com [209.181.253.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5058F2546; Sun, 11 Aug 2013 13:25:44 +0000 (UTC) Received: from olive.macktronics.com (olive.macktronics.com [209.181.253.67]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by borg.macktronics.com (Postfix) with ESMTPS id 930D8AEE; Sun, 11 Aug 2013 08:25:43 -0500 (CDT) Date: Sun, 11 Aug 2013 08:25:42 -0500 (CDT) From: Dan Mack To: Glen Barber Subject: Re: nanobsd-built system doesn't have SVN revision in "uname" (and it looks like regression) In-Reply-To: <20130810182459.GF2432@glenbarber.us> Message-ID: References: <383656436.20130810150849@serebryakov.spb.ru> <37152758.20130810151846@serebryakov.spb.ru> <602958881.20130810180203@serebryakov.spb.ru> <20130810141324.GD2432@glenbarber.us> <529930061.20130810191339@serebryakov.spb.ru> <20130810181152.GE2432@glenbarber.us> <20130810182459.GF2432@glenbarber.us> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Lev Serebryakov , freebsd-embedded@freebsd.org, freebsd-current@freebsd.org X-BeenThere: freebsd-embedded@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Dedicated and Embedded Systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Aug 2013 13:25:45 -0000 There's still one problem left ... the svnliteversion test fails because you are not in the correct directory. This is the patch that worked for me ... root@olive:/usr/src # svnlite diff sys/conf/newvers.sh Index: sys/conf/newvers.sh =================================================================== --- sys/conf/newvers.sh (revision 254187) +++ sys/conf/newvers.sh (working copy) @@ -105,7 +105,7 @@ done if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then - /usr/bin/svnliteversion $(basename ${0}) >/dev/null 2>&1 + cd ${SYSDIR}/conf && /usr/bin/svnliteversion $(basename ${0}) >/dev/null 2>&1 if [ $? -eq 0 ]; then svnversion=/usr/bin/svnliteversion else On Sat, 10 Aug 2013, Glen Barber wrote: > On Sat, Aug 10, 2013 at 02:11:52PM -0400, Glen Barber wrote: >> On Sat, Aug 10, 2013 at 01:09:20PM -0500, Dan Mack wrote: >>> It looks like you are doing the first [! -z '"${svnversion}"' ] >>> before $svnversion is being set. In the old version, this was >>> being set via: >>> >>> if [ -x /usr/bin/svnliteversion ] ; then >>> svnversion=/usr/bin/svnliteversion >>> fi >>> >>> But I'm not sure if that's intentional or not ... >>> >> >> Ugh. No, this was not intentional. I'll have this fixed shortly. >> > > Fixed in r254184. The problem is that I was evaluating ${svnversion} > being set before looking for /usr/bin/svnliteversion; however when > _running_ /usr/bin/svnliteversion, it was being run as > /usr/bin/svnversion by mistake. > > Thank you for the reports, and Dan, thank you for your help. > > Glen > > dan -- Dan Mack