From owner-svn-src-head@freebsd.org Tue Jul 24 03:31:21 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 9C87B103DAD6 for ; Tue, 24 Jul 2018 03:31:21 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with ESMTP id 3B4C07C802 for ; Tue, 24 Jul 2018 03:31:21 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: (qmail 30164 invoked from network); 24 Jul 2018 03:33:47 -0000 Received: from unknown (HELO exbuntu.daemonology.net) (127.0.0.1) by ec2-107-20-205-189.compute-1.amazonaws.com with ESMTP; 24 Jul 2018 03:33:47 -0000 Received: (qmail 3254 invoked from network); 24 Jul 2018 03:33:08 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by clamshell.daemonology.net with SMTP; 24 Jul 2018 03:33:08 -0000 Subject: Re: svn commit: r336593 - head/release To: Matthew Macy Cc: rgrimes@freebsd.org, src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201807221504.w6MF4bWW027109@pdx.rh.CN85.dnsmgr.net> From: Colin Percival Openpgp: preference=signencrypt Autocrypt: addr=cperciva@freebsd.org; prefer-encrypt=mutual; keydata= xsDhBElrAAcRBACDfDys4ZtK+ErCJ1HAzYeteKpm3OEsvT/49AjUTLihkF79HhIKrCQU+1KC zv7BwHCMLb6hq30As9L7iFKG7n5QFLFC4Te/VcITUnWHMG/c3ViLOfJGvi+9/nOEHaM1dVJY D6tEp5yM1nHmVQpo9932j4KGuGFR0LhOK5IHXOSfGwCgxSFDPdgxe2OEjWxjGgY+oV3EafcD +JROXCTjlcQiG/OguQH4Vks3mhHfFnEppLxTkDuYgHZQiUtpcT9ssH5khgqoTyMar05OUdAj ZIhNbWDh4LgTj+7ZmvLhXT5Zxw8LX9d7T36aTB8XDQSenDqEtinMWOb0TCBBLbsB8EFG1WTT ESbZci9jJS5yhtktuZoY/eM8uXMD/3k4FWFO80VRRkELSp+XSy/VlSQjyi/rhl2nQq/oOA9F oJbDaB0yq9VNhxP+uFBzBWSqeIX0t1ZWLtNfVFr4TRP5hihI5ICrg/0OpqgisKsU2NFe9xyO hyJLYmfD8ebpDJ/9k30C7Iju9pVrwLm1QgS4S2fqJRcR+U4WbjvP7CgSzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wmEEExECACEFAklrALYCGwMHCwkIBwMCAQQV AggDBBYCAwECHgECF4AACgkQOM7KaQxqam6/igCgn+z2k3V5ggNppmWrZstt1U2lugsAoL7L wS9V9yLtil3oWmHtwpUqYruEzsFNBElrAAcQCAD3ZLMIsP4CIDoJORg+YY0lqLVBgcnF7pFb 4Uy2+KvdWofN+DKH61rZLjgXXkNE9M4EQC1B4lGttBP8IY2gs41y3AUogGdyFbidq99rCBz7 LTsgARHwFxZoaHmXyiZLEU1QZuMqwPZV1mCviRhN5E3rRqYNXVcrnXAAuhBpvNyj/ntHvcDN 2/m+ochiuBYueU4kX3lHya7sOj+mTsndcWmQ9soOUyr8O0r/BG088bMn4qqtUw4dl5/pglXk jbl7uOOPinKf0WVd2r6M0wLPJCD4NPHrCWRLLLAjwfjrtoSRvXxDbXhCdgGBa72+K8eYLzVs hgq7tJOoBWzjVK6XRxR7AAMGB/9Mo3iJ2DxqDecd02KCB5BsFDICbJGhPltU7FwrtbC7djSb XUrwsEVLHi4st4cbdGNCWCrp0BRezXZKohKnNAPFOTK++ZfgeKxrV2sJod+Q9RILF86tQ4XF 7A7Yme5hy92t/WgiU4vc/fWbgP8gV/19f8nunaT2E9NSa70mZFjZNu4iuwThoUUO5CV3Wo0Y UISsnRK8XD1+LR3A2qVyLiFRwh/miC1hgLFCTGCQ3GLxZeZzIpYSlGdQJ0L5lixW5ZQD9r1I 8i/8zhE6qRFAM0upUMI3Gt1Oq2w03DiXrZU0Fu/R8Rm8rlnkQKA+95mRTUq1xL5P5NZIi4gJ Z569OPMFwkkEGBECAAkFAklrAAcCGwwACgkQOM7KaQxqam41igCfbaldnFTu5uAdrnrghESv EI3CAo8AoLkNMks1pThl2BJNRm4CtTK9xZeH Message-ID: Date: Mon, 23 Jul 2018 20:33:08 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: Tue, 24 Jul 2018 03:31:21 -0000 On 07/22/18 15:53, Matthew Macy wrote: > That would only fix it if svn weren't installed. Oops, good point. Thanks for fixing this, your commits look good to me. Colin Percival > On Sun, Jul 22, 2018 at 9:31 AM, Colin Percival wrote: >> On 07/22/18 08:04, Rodney W. Grimes wrote: >>>> 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. >> >> I'm about to head mostly-AFK for the week, but one option here would be >> to change >> >> EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | >> sed -e 's/\^\///' >> EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} >> >> to >> >> .if defined(SVN_CMD) >> EC2_SVNBRANCH!= ${SVN_CMD} info --show-item relative-url ${WORLDDIR} | >> sed -e 's/\^\///' >> EC2_SVNREV!= ${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR} >> .else >> EC2_SVNBRANCH= unknown >> EC2_SVNREV= unknown >> .endif >> >> I don't know if this will make any difference to anyone using this code, >> but it should at least silence the warnings for people who aren't checking >> code out from svn. >> >> Colin Percival >> >>>> 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} >>>>> >>>> >>>> >>> >> >> -- >> Colin Percival >> Security Officer Emeritus, FreeBSD | The power to serve >> Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid > > > -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid