From owner-freebsd-arm@FreeBSD.ORG Fri Jun 27 15:12:13 2014 Return-Path: Delivered-To: freebsd-arm@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 ESMTPS id 9F04B928; Fri, 27 Jun 2014 15:12:13 +0000 (UTC) Received: from forward4l.mail.yandex.net (forward4l.mail.yandex.net [IPv6:2a02:6b8:0:1819::4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "forwards.mail.yandex.net", Issuer "Certum Level IV CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5D3CB29F3; Fri, 27 Jun 2014 15:12:13 +0000 (UTC) Received: from smtp7.mail.yandex.net (smtp7.mail.yandex.net [77.88.61.55]) by forward4l.mail.yandex.net (Yandex) with ESMTP id 8D7E614417CF; Fri, 27 Jun 2014 19:12:09 +0400 (MSK) Received: from smtp7.mail.yandex.net (localhost [127.0.0.1]) by smtp7.mail.yandex.net (Yandex) with ESMTP id 252B41580991; Fri, 27 Jun 2014 19:12:09 +0400 (MSK) Received: from 87.249.28.58.tel.ru (87.249.28.58.tel.ru [87.249.28.58]) by smtp7.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id NVRAFhVhD0-C88m80CD; Fri, 27 Jun 2014 19:12:08 +0400 (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client certificate not present) X-Yandex-Uniq: a97e9ac0-ffdc-4675-a281-741687d2c690 Message-ID: <53AD89C7.7010403@passap.ru> Date: Fri, 27 Jun 2014 19:12:07 +0400 From: Boris Samorodov User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Warner Losh Subject: Re: [crochet] Introduce SVN_CMD at lib/subversion.sh References: <53AD4BBF.9060202@passap.ru> In-Reply-To: X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: freebsd-arm@FreeBSD.org X-BeenThere: freebsd-arm@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "Porting FreeBSD to ARM processors." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 15:12:13 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 27.06.2014 18:53, Warner Losh пишет: > > On Jun 27, 2014, at 4:47 AM, Boris Samorodov wrote: > >> Hi Tim, All! >> >> Sometimes I use systems which have only svnlite version. >> I propose a patch to let crochet work at those systems as well: > > Where is SVN_CMD set? Look further at [*] > Most other things in the system would just call this SVN. Is there a reason we need the _CMD? No reason. The name was inspired by the port's system (like ECHO_CMD, etc.). I'm fine with whatever name. > Warner > >> ----- >> --- lib/subversion.sh.orig 2014-03-30 13:28:41.000000000 +0400 >> +++ lib/subversion.sh 2014-06-27 14:37:01.668105743 +0400 >> @@ -1,15 +1,16 @@ >> +: ${SVN_CMD:=`which svn 2>/dev/null || which svnlite 2>/dev/null`} [*] >> svn_update_sourcetree ( ) { >> echo "Updating source tree ${FREEBSD_SRC}" >> cd ${FREEBSD_SRC} >> - svn update > ${WORKDIR}/_.svnupdate.log >> + ${SVN_CMD} update > ${WORKDIR}/_.svnupdate.log >> cd ${TOPDIR} >> } >> >> svn_get_revision ( ) { >> _PWD=`pwd` >> cd ${FREEBSD_SRC} >> - SOURCE_VERSION=`svn info |grep Revision: |cut -c11-` >> + SOURCE_VERSION=`${SVN_CMD} info |grep Revision: |cut -c11-` >> cd $_PWD >> echo "Source version is: ${SOURCE_VERSION:-unknown}"; >> } >> ----- - -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCgAGBQJTrYnHAAoJEJYOILA6P20oh0YP/3V4QOnGwsJrCgy0/1rWrRiG bj+B7dd8knDS/XuKmuS2+qFgeXE59tQtUvh1U6SnZsUk/Xttse/JXc3H1iroG/VW aVcqgjjTgjySVQfBhhPgXGaaimbPGLdA2ScSi4doub52xr3Nx+jC1NQzyyhZ2my0 Ot3lp6UZoPxjzOq/hWXdUxHWX69c5TIm/qqOj64pYa7Uhxys7iCHHKSaDy0O/9HN VwsBYqjnNXZM+yZJMT6JwV+RFEvK+IElXGT6Qsk5uK3XMyPGkTfCKUbVURGWK9dN xpH4yeF8BJN1qQ0IDsRyFhEGaUrVBgrfz8afJKppRpQFeGZ1Bw+N1V6dWt6NtbJx rMSBwMOFI2NCQ2hN35GuER5Xh6dNmrJGbsjU6Ypc6SLhgxkDunKZOPyQJobilV4I Fn/fH0yqda4gdBv260csd2ly3ogreYEswizKafOsTkphIP3eaZK3znYFmsXmMEU/ aHPVsz+MZEg5mqDrRi4gF20rnqfoJtmr55CgDyhNuL6h4imxBCE+oLDxu9UmHJ0H JI2uaLhZ1d07cuUiNqk4SyWbMnJWINZcLgrJz1pIDRTeBSIUfV6PSSlQbKQstpEF dfLBT8WCqyitY3THsYMuQhLibWjA2+OhRSMqcn0RuPqPrIATisrevPtSnzAPFJGf S4DT2VpBb6lkktTwMa1v =AU2E -----END PGP SIGNATURE-----