svn commit: r336593 - head/release

[Rodney W. Grimes]

> 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 <cperciva at freebsd.org> 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 at freebsd.org