From owner-freebsd-arm@FreeBSD.ORG Fri Jun 27 15:25:02 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 29BFCE76 for ; Fri, 27 Jun 2014 15:25:02 +0000 (UTC) Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EC1582B1E for ; Fri, 27 Jun 2014 15:25:01 +0000 (UTC) Received: by mail-pd0-f172.google.com with SMTP id w10so4534765pde.31 for ; Fri, 27 Jun 2014 08:24:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:message-id:references:to; bh=57UDh30YrlnejcQ1leF2yDqhOE5wGOPfQ1oiIQaESZA=; b=jaOLyPoki3XgtUf0GS1KePESGpQuDOoqNI7VfFKtfiCttrA7+UpKVL/4O5DXkzFhrP rmNy62AQihjhQ2Gi4x8ny4Am0LZs6ilwvliPoMelqPmT/oVu23boDD9ykrj1zUuB9n5R EsXhvMyC7Qx4MJ7Y0eE12Ej1UACRJAXwcvQZ8UMdYfWhkJVhz/GrZ/iHf2Jix3fh2U1F 3Rmjmfja4OfmhdEOc4khaOk9IM09e+JXRoHygEERLmd8uBiJMvGLAQlGB5ISYHTCMRrG ywjR74C1r96Y9cIbRbTfrFilo6tkfXbSvliLX3inyuvRaD3gh9Xjl6fUwM870hEeqrA4 nCUA== X-Gm-Message-State: ALoCoQle8vsoAI75yNmGtpihVxYgyEJM8Y8Km4OQRvNbq2AN+UrBwnJi7sds1ctBDkig250Fojbl X-Received: by 10.68.164.100 with SMTP id yp4mr31297117pbb.136.1403882695122; Fri, 27 Jun 2014 08:24:55 -0700 (PDT) Received: from lgmac-sckelly.corp.netflix.com (dc1-prod.netflix.com. [69.53.236.251]) by mx.google.com with ESMTPSA id yv7sm52930357pac.33.2014.06.27.08.24.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Jun 2014 08:24:54 -0700 (PDT) Sender: Warner Losh Content-Type: multipart/signed; boundary="Apple-Mail=_559AF028-445E-4F13-9B08-1DDA32A60904"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.2\)) Subject: Re: [crochet] Introduce SVN_CMD at lib/subversion.sh From: Warner Losh In-Reply-To: <53AD89C7.7010403@passap.ru> Date: Fri, 27 Jun 2014 09:24:53 -0600 Message-Id: References: <53AD4BBF.9060202@passap.ru> <53AD89C7.7010403@passap.ru> To: Boris Samorodov X-Mailer: Apple Mail (2.1878.2) 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:25:02 -0000 --Apple-Mail=_559AF028-445E-4F13-9B08-1DDA32A60904 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On Jun 27, 2014, at 9:12 AM, Boris Samorodov wrote: > Signed PGP part > 27.06.2014 18:53, Warner Losh =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > > > 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? >=20 > Look further at [*] Ah. Need more caffeine. > > Most other things in the system would just call this SVN. Is there a = reason we need the _CMD? >=20 > No reason. The name was inspired by the port's system (like ECHO_CMD, > etc.). I'm fine with whatever name. Yea, some parts of the project like to have a _CMD (like ports), while = other parts only do _CMD when the command name has been stolen for something else (like the build = and nanobsd). Warner > > 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:=3D`which svn 2>/dev/null || which svnlite = 2>/dev/null`} >=20 > [*] >=20 > >> 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=3D`pwd` > >> cd ${FREEBSD_SRC} > >> - SOURCE_VERSION=3D`svn info |grep Revision: |cut -c11-` > >> + SOURCE_VERSION=3D`${SVN_CMD} info |grep Revision: |cut -c11-` > >> cd $_PWD > >> echo "Source version is: ${SOURCE_VERSION:-unknown}"; > >> } > >> ----- >=20 > -- > WBR, Boris Samorodov (bsam) > FreeBSD Committer, http://www.FreeBSD.org The Power To Serve >=20 --Apple-Mail=_559AF028-445E-4F13-9B08-1DDA32A60904 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJTrYzFAAoJEGwc0Sh9sBEAWo0P/1HndbBjtbeiVFN5867Lg58c 4hkixd8fwlpoxPxA5IGcWSV1G/cGE1Wv5PASadQfg5DSZ7jKrCgFAmqr2UczTIG+ 8oTct32Su9UGGI6OGVQEYebUgB/C7Tr0NS0D8AwoXmxLHdmgzha8eAE2aoqzl4pi cfXqWFJ6OT1cBUnNyV2cgm9KB3zgr/5FIXCQPOMeBtCS2hzG6LKfK2vfptRAyXVk plUrDSjcOXYgANWSjyi8JylXf4Z4Gnmp08itQ3jtxI0pJmBqDjjv1WGAccPsmKFP 0H7GMWquJ96d0Uxir16T20HcStCOcaFAbWx6rJvFCg0pYMkeXSNg9mxsYoKlFjeu gFZhx/ouSkjrjy3xp/mSFAXIT7TYeLjTF0Ao9fiEOe5BI5rrozBqZKuiXxT/R0sK dPY1xDjPsGqGvk97vVEK0czN3nZWTO4khaB8VCd6JBJkg8NrJpaKvPBDp2s7stAW QSSIuRx6ARcse7stq24htmNHk81a5vSN1q+8l+RM3i9yK5M4EGA9RfSvy3mJ1/Fb Z5RhJR+wYNae+8xzPnYYcRaP403NPwLEA0DhyU4kDMYSiuiOIgowiMlh4dabFNBC ayU4dlBNuCyeyZeW5cC/q9qAKpQO9b+Zw4pUn9ZR/Esm2LIFr2+K04OcHSH96/LD KA0il6QmFTJN+0iwEm1Z =K8J+ -----END PGP SIGNATURE----- --Apple-Mail=_559AF028-445E-4F13-9B08-1DDA32A60904--