From owner-svn-src-head@freebsd.org Fri Sep 11 16:56:38 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 637293E03F8; Fri, 11 Sep 2020 16:56:38 +0000 (UTC) (envelope-from ruslanngaripov@gmail.com) Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bp2394b2Sz4ZQc; Fri, 11 Sep 2020 16:56:37 +0000 (UTC) (envelope-from ruslanngaripov@gmail.com) Received: by mail-lj1-x243.google.com with SMTP id k25so13033144ljk.0; Fri, 11 Sep 2020 09:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=dr3Q30YDq5H5NwV/bsrqUIuQ7lkkcnsEeXgTZyCKYx4=; b=EsyK9WCKJqt2IeucgaLVQjr1SO/v7K+1uzwOfouNr7puiJfC8DPggTccpPEfYnItZT mkiqaCaaScfETrkIvOe9GzdpXrg6aAg4tm1VPa9vD4hdKZ//U+gOvuZ/xx5nbRLH1do2 GrmkLo2ygbqv9pQAJQbvbDL9aHvmwex3zpY4nuND5mFE2ImahUK/Pm2dGngwM+xFWxyD enrz4mLQTOA03REi0adjieULEdV/H9VPuWVLe8FmUdd07GhX7OcfrBF/YuD05SmrGLYD CSBBA0qTh8RlgdNn7fimpdpIROwZhOIfz4XkPSuPpVrfmTe+dKnAIC5Tw0jcdUvqvH+c gXdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=dr3Q30YDq5H5NwV/bsrqUIuQ7lkkcnsEeXgTZyCKYx4=; b=Kc/XF6mHp0vY9OXsuwVgBoALbKuQY93cEKSCV9WF+QfIsxXPU/GICxtu6FZxCZwjj5 IgtSAKY96XyegV3kby3QA+jZzPxOLLGNyPeaMld/b0nMvtZNutCMnlQb6OkAJrgYT392 HijvMeoNzMmR/2BbJC4bAIqyzzVAed5/hAnZTfQOGNVCgz4JlNoay5ZxkvSNCYTYE8aj IUiWMdGTlv7rvve4rcb1NqQDZhmgoLR7cl84RU7R1m4OkUvX1b2WlYglkqjUXzsBESLn qRMgGkxF76DZqvsyZ9OV/OsJfk5ptYavGyvuorgSbfHWtYie0cv3zsGygbbdqLOqVqYb RcgQ== X-Gm-Message-State: AOAM53066MF+TWAnRSjHNqPnUKYksD8hBg5zhJarMipKic8NJRolYFof L49RndqPy5/vZWCWDsM8DwDtFt0D3Yo= X-Google-Smtp-Source: ABdhPJwAZNRJvh3ymEIxHNmYaynzdv3ex1M5GysiIcjP611mtNxT3Qgr6v+8TqdxxVwd18saRvfnXQ== X-Received: by 2002:a2e:8146:: with SMTP id t6mr1015014ljg.259.1599843395527; Fri, 11 Sep 2020 09:56:35 -0700 (PDT) Received: from [192.168.1.6] ([188.226.57.142]) by smtp.gmail.com with ESMTPSA id q7sm508208lfr.16.2020.09.11.09.56.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Sep 2020 09:56:35 -0700 (PDT) Subject: Re: svn commit: r364891 - in head: . release release/scripts To: Glen Barber Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202008272119.07RLJGgb043888@repo.freebsd.org> <174719d0148.27b9.e2363f32305322128423a5fd7014e4c4@gmail.com> <20200909135114.GC61041@FreeBSD.org> <1747c711988.27b9.e2363f32305322128423a5fd7014e4c4@gmail.com> <20200911125525.GC61041@FreeBSD.org> From: Ruslan Garipov Message-ID: <6d1dd875-c0d6-0006-d829-905534728589@gmail.com> Date: Fri, 11 Sep 2020 21:56:31 +0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.2.1 MIME-Version: 1.0 In-Reply-To: <20200911125525.GC61041@FreeBSD.org> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4Bp2394b2Sz4ZQc X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=EsyK9WCK; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of ruslanngaripov@gmail.com designates 2a00:1450:4864:20::243 as permitted sender) smtp.mailfrom=ruslanngaripov@gmail.com X-Spamd-Result: default: False [-3.36 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.42)[-0.417]; RECEIVED_SPAMHAUS_PBL(0.00)[188.226.57.142:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.95)[-0.955]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.99)[-0.992]; MIME_GOOD(-0.10)[text/plain]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::243:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-head,svn-src-all] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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: Fri, 11 Sep 2020 16:56:38 -0000 On 9/11/2020 5:55 PM, Glen Barber wrote: > On Fri, Sep 11, 2020 at 02:13:41PM +0500, Ruslan Garipov wrote: >> On September 9, 2020 6:51:18 PM Glen Barber wrote: >> >>> On Wed, Sep 09, 2020 at 11:45:49AM +0500, Ruslan Garipov wrote: >>>> On August 28, 2020 2:19:33 AM Glen Barber wrote: >>>> >>>>> Author: gjb >>>>> Date: Thu Aug 27 21:19:16 2020 >>>>> New Revision: 364891 >>>>> URL: https://svnweb.freebsd.org/changeset/base/364891 >>>>> >>>>> Log: >>>>> Merge the projects/release-git branch to head. >>>>> This allows building 13.x from Git instead of Subversion. >>>> I'm sorry for the late response (and for the bad first one I made on this >>>> commit recently via Gmail web client). >>>> >>>> My build machine is completely offline. I provide it with fresh snapshots >>>> of the source and ports tree manually -- via tarballs which I'm pulling on >>>> a FreeBSD machine having Internet connection. Therefore, neither >>>> "/scratch", nor the chrooted environment for me don't require Internet >>>> access (I fetch distfiles for offline usage too). >>>> >>>> Can we somehow remove that requirement for the devel/git port? For >>>> example, if one has set all three {SRC,PORTS,DOC}_UPDATE_SKIP variables, >>>> then release/release.sh doesn't require devel/git to exist on the host. >>>> >>>> I really don't need git on my build machine (and don't need it for >>>> building). >>>> >>> >>> Can you verify if the attached patch works for your use case? You will >>> need to set NOGIT=1 in your release.conf. >> Partially. It doesn't require devel/git to create the initial build >> environment, but it does before beginning cross-build in the >> extra_chroot_setup(). >> >> You check there does the NOGIT have zero length. If NOGIT isn't empty, then >> release.sh will ($(which git) returns nothing for me) try to install >> devel/git port or package again. And NOGIT isn't empty because in this >> function my release.conf was already sourced. So I had removed "not" >> (``!'') on line #278, ignoring NOGIT checking, and cross-build started. >> > > Doh! Yeah, that was a mistake - sorry about that. > > So as far as you are concerned, with the addition of removing the '!', > it works as you expect? Yes, it does. Should we also "fix" env_setup()? Which also checks NOGIT for zero length. What if one set NOGIT up outside release.conf as NOGIT=1 (I don't do that). Does he/she end up with "The devel/git is required"? > >> It failed eventually on modifications made by r365398, but that's another >> story. >> >> Thanks again, Glen! >> > > Thank you for testing (and finding a silly bug)! > > Glen >