From owner-svn-src-head@freebsd.org Sun Jul 22 05:19:36 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 2238810404F7; Sun, 22 Jul 2018 05:19:36 +0000 (UTC) (envelope-from mat.macy@gmail.com) Received: from mail-io0-x22e.google.com (mail-io0-x22e.google.com [IPv6:2607:f8b0:4001:c06::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 90E5A8707B; Sun, 22 Jul 2018 05:19:35 +0000 (UTC) (envelope-from mat.macy@gmail.com) Received: by mail-io0-x22e.google.com with SMTP id o22-v6so11964485ioh.6; Sat, 21 Jul 2018 22:19:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=cx+IrR7LlMaVIBvCByTTb6/XWJThm7usUnN8fuSRme4=; b=d3LVRPdArqy8kK5Sruh6FcyxywZb/VXWICZu64Lt7aRC7phNOd2xX17lyXfGEIPIYl suVBgoE4DmFJRgXuLGWZrjHestx6IYMYeLTg7Q47wG/u4z0IrEX5JKxDRt1ydJFWzvVd z1sNqXtDG0/4yvWJLg+nIiPXJ3Mg+gQ9obYMe6yWjQyJ0nCLu+xC8hHkglz6dtNx9t8J In7KvQVve+nkPNmYpdJMg2e+apat3tGoBw3Zx2Hbu/H4lg7v3jl1T1jM6tcVZH7mZK0W CZqIMZHhQWVdrmlZThowvZw39suKMSmTPxdZGY9J7pb1z4qXMNACb/7UnA6B+aTkG5k5 4U7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=cx+IrR7LlMaVIBvCByTTb6/XWJThm7usUnN8fuSRme4=; b=Vg08rdemXBBmOCqHkjKxZRXw97sKD0y0DiT3DgjMTGwE8E62Ho0safhRfo2ufJy+aj 3LQtwvdfx0wHcGrM7iZh/ifMNY3RwYJbNWO/jVLhy+5LuincTuVa6VpyQOEQ423Tvg1P kQqiJItFeuYAGk96LR4cvv3XfGrlc2Z5j4QXTjWCyKTEQTDsMMI6fr2oneyqfnOJ4lh7 qGGV+TKpsyaZ/g9fIXvwRBNwpEV3Ac5lqDreDasQzOkJ6HoAkteVnMudn+rNwSaEVDX/ p23aykCjuljdI9nbX6x3syoaQldue7+NBzvm9KZcQ4wmTmmnt1RnkwN/2Il2CUC9dNYf iuHA== X-Gm-Message-State: AOUpUlEhSNQBlzn4Po0PcabX6Ka7ppNTXgSCB7LCeUJ4spVQuyml6jQm WIt3TMOQW3BFO9E+xwQfxb5xr1ooNUzd7PZOzs1UVZsP X-Google-Smtp-Source: AAOMgpcbXZCXeoBJx6uANrtdBgWmL4+MCUJDdnqOoLjFv8gb3J7uaDvqTH1coh0rxeo/2dokpWAjGf+gtY4AK9cLK5o= X-Received: by 2002:a5e:dc49:: with SMTP id s9-v6mr6133386iop.237.1532236774282; Sat, 21 Jul 2018 22:19:34 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:8d2:0:0:0:0:0 with HTTP; Sat, 21 Jul 2018 22:19:33 -0700 (PDT) In-Reply-To: <201807212254.w6LMsi3v000889@repo.freebsd.org> References: <201807212254.w6LMsi3v000889@repo.freebsd.org> From: Matthew Macy Date: Sat, 21 Jul 2018 22:19:33 -0700 Message-ID: Subject: Re: svn commit: r336593 - head/release To: Colin Percival Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" 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 05:19:36 -0000 Build still works, but you're assuming that developers only use 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} >