From owner-svn-src-head@freebsd.org Sun Jul 22 15:04:47 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87AB8104DC9D; Sun, 22 Jul 2018 15:04:47 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C84A377BFE; Sun, 22 Jul 2018 15:04:46 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w6MF4b26027110; Sun, 22 Jul 2018 08:04:37 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w6MF4bWW027109; Sun, 22 Jul 2018 08:04:37 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201807221504.w6MF4bWW027109@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r336593 - head/release In-Reply-To: To: Matthew Macy Date: Sun, 22 Jul 2018 08:04:37 -0700 (PDT) CC: Colin Percival , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jul 2018 15:04:47 -0000 > Build still works, but you're assuming that developers only use svn. No, he correctly assumed that RELEASE engineering only uses svn/svnlite for building release images. This Makefile is for production of official AMIs, official stuff always uses svn. > make[1]: "/usr/home/mmacy/devel/freebsd/Makefile.inc1" line 343: > SYSTEM_COMPILER: libclang will be built for bootstrapping a > cross-compiler. > make[1]: "/usr/home/mmacy/devel/freebsd/Makefile.inc1" line 348: > SYSTEM_LINKER: libclang will be built for bootstrapping a > cross-linker. > svn: E155007: '/usr/home/mmacy/devel/freebsd' is not a working copy > svn: E155007: '/usr/home/mmacy/devel/freebsd' is not a working copy > make[2]: "/usr/home/mmacy/devel/freebsd/release/Makefile.ec2" line 19: > warning: "/usr/local/bin/svn info --show-item last-changed-revision > /usr/home/mmacy/devel/freebsd/release/.." returned non-zero status > svn: E155007: '/usr/home/mmacy/devel/freebsd' is not a working copy > svn: E155007: '/usr/home/mmacy/devel/freebsd' is not a working copy > make[2]: "/usr/home/mmacy/devel/freebsd/release/Makefile.ec2" line 19: > warning: "/usr/local/bin/svn info --show-item last-changed-revision > /usr/home/mmacy/devel/freebsd/release/.." returned non-zero status > > On Sat, Jul 21, 2018 at 3:54 PM, Colin Percival wrote: > > Author: cperciva > > Date: Sat Jul 21 22:54:43 2018 > > New Revision: 336593 > > URL: https://svnweb.freebsd.org/changeset/base/336593 > > > > Log: > > Use svn or svnlite, or ${SVN_CMD} if set, for extracting the SVN branch > > and revision number announced in SNS notifications about new EC2 AMIs. > > > > While I'm here, incorporate that information into the AMI "description" > > fields, since it's more useful than simply echoing the information > > already provided via the AMI "name". > > > > Approved by: gjb > > > > Modified: > > head/release/Makefile.ec2 ^^^^^^^^^^ > > > > Modified: head/release/Makefile.ec2 > > ============================================================================== > > --- head/release/Makefile.ec2 Sat Jul 21 22:15:48 2018 (r336592) > > +++ head/release/Makefile.ec2 Sat Jul 21 22:54:43 2018 (r336593) > > @@ -5,6 +5,19 @@ > > # Makefile for creating an EC2 AMI from a disk image. > > # > > > > +# Figure out where SVN is > > +.if !defined(SVN_CMD) || empty(SVN_CMD) > > +. for _P in /usr/bin /usr/local/bin > > +. for _S in svn svnlite > > +. if exists(${_P}/${_S}) > > +SVN_CMD= ${_P}/${_S} > > +. endif > > +. endfor > > +. endfor > > +.endif > > +EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///' > > +EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} > > + > > .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE" > > AMINAMESUFFIX!= date +-%Y-%m-%d > > .endif > > @@ -13,8 +26,6 @@ PUBLISH= --public > > .endif > > .if defined(EC2SNSTOPIC) && !empty(EC2SNSTOPIC) > > EC2SNSREL= ${REVISION}-${BRANCH} > > -EC2_SVNBRANCH!= svn info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///' > > -EC2_SVNREV!= svn info --show-item last-changed-revision ${WORLDDIR} > > EC2SNSVERS= ${EC2_SVNBRANCH}@${EC2_SVNREV} > > .endif > > > > @@ -60,7 +71,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} > > /usr/local/bin/bsdec2-image-upload ${PUBLISH} --sriov --ena \ > > ${.OBJDIR}/ec2.raw \ > > "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \ > > - "${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \ > > + "${TYPE}/${TARGET} ${EC2_SVNBRANCH}@${EC2_SVNREV}" \ > > ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \ > > ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS} > > @touch ${.TARGET} > > > > -- Rod Grimes rgrimes@freebsd.org