From owner-svn-src-all@freebsd.org Wed Jun 5 06:00:41 2019 Return-Path: Delivered-To: svn-src-all@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 6A83715C6587 for ; Wed, 5 Jun 2019 06:00:41 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 EAB846D3D2 for ; Wed, 5 Jun 2019 06:00:39 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by mail-io1-f65.google.com with SMTP id k8so19352755iot.1 for ; Tue, 04 Jun 2019 23:00:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nqvy31M/IhoK922baOhaYrdlIlld7bc1ZInbN0zEc+Y=; b=rUkglG4h2UYzzM1yTJ7YaIj56EqbP7ecTLILNAl9aZXMS+E7VP+Fs5HiQWWDvIkVyH oV2r94/qZKBk0tvEBon5J37Eh+Y50Am7EICi2+kNKmCjI6excAUSaJVGe/CErsxQkdsV Dm92QuQuVrjWcXIYR9zCaci2vPZOeiE0dbTooum3rviz753ILFRWT9mCrg22SaU1i2Ns kfQ+92FNIWdbWY9cji2fze37VHYidvnSTMXuKDF05IgOw4NLCZ8Zbmb0v/Q5uFUk/Hhs hJup255z8VTv6nVQdDB3KKvsgtletKvnVicFBlJ5ptJ56cqEXO3xALJ0v29M4Yzbcc6/ +6eA== X-Gm-Message-State: APjAAAXz73Mu47kx+klFjx/pIasQoj66wjlhVfvt0zvRSEWhCzi9IMR2 fbrAIz9K8Hl6d5oY9tAYyNYc2GC+b+0fIOWhXXBeiw== X-Google-Smtp-Source: APXvYqzSpIY7HkFL4LUMOZzl8E/Q8R2DO8Qjflrz7JuAwdxDy3vBRoUhP6aUMsv1T4BLBjap/uEHP9SBA8hh7Jp8AH0= X-Received: by 2002:a5d:968e:: with SMTP id m14mr22703245ion.49.1559714438694; Tue, 04 Jun 2019 23:00:38 -0700 (PDT) MIME-Version: 1.0 References: <201906031842.x53IgoVw044142@gndrsh.dnsmgr.net> In-Reply-To: <201906031842.x53IgoVw044142@gndrsh.dnsmgr.net> From: Maxim Sobolev Date: Tue, 4 Jun 2019 23:00:27 -0700 Message-ID: Subject: Re: svn commit: r348521 - in head: . etc sys/conf sys/modules usr.bin/login usr.sbin/services_mkdb To: "Rodney W. Grimes" Cc: Enji Cooper , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: EAB846D3D2 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of sobomax@sippysoft.com designates 209.85.166.65 as permitted sender) smtp.mailfrom=sobomax@sippysoft.com X-Spamd-Result: default: False [-3.02 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; URI_COUNT_ODD(1.00)[5]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[alt1.aspmx.l.google.com,aspmx.l.google.com,alt3.aspmx.l.google.com,alt2.aspmx.l.google.com,alt4.aspmx.l.google.com]; NEURAL_HAM_SHORT(-0.76)[-0.758,0]; RCVD_IN_DNSWL_NONE(0.00)[65.166.85.209.list.dnswl.org : 127.0.5.0]; RCVD_TLS_LAST(0.00)[]; FORGED_SENDER(0.30)[sobomax@freebsd.org,sobomax@sippysoft.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[sobomax@freebsd.org,sobomax@sippysoft.com]; IP_SCORE(-1.25)[ip: (-0.49), ipnet: 209.85.128.0/17(-3.39), asn: 15169(-2.30), country: US(-0.06)]; FREEMAIL_CC(0.00)[gmail.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jun 2019 06:00:41 -0000 https://reviews.freebsd.org/D20520 has been created as a follow-up. Give it some feedback, thanks! -Max On Mon, Jun 3, 2019 at 11:42 AM Rodney W. Grimes wrote: > > On Mon, Jun 3, 2019 at 7:28 AM Enji Cooper > wrote: > > > > > Hi Maxim, > > > > > > > > > > Modified: head/Makefile.inc1 > > > > > > > > ============================================================================== > > > > --- head/Makefile.inc1 Sun Jun 2 22:27:26 2019 (r348520) > > > > +++ head/Makefile.inc1 Sun Jun 2 23:38:19 2019 (r348521) > > > > @@ -887,8 +887,8 @@ MTREEFLAGS+= -W > > > > INSTALLFLAGS+= -h sha256 > > > > .endif > > > > .if defined(DB_FROM_SRC) || defined(NO_ROOT) > > > > -IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}" > > > > -IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}" > > > > +IMAKE_INSTALL= INSTALL="${INSTALL} ${INSTALLFLAGS}" > > > > +IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}" > > I see the bugger with this change now, it is a loop, > MTREE_CMD=${MTREE_CMD}... and I do not think MTREE_CMD is defined > at this point, see below. > > > > > .endif > > > > > > Please back out this part of the change as it is unnecessary and > adds > > > a dependency on sys.mk?s definitions. $PATH should contain, i.e., be > > > populated, with these tools when running make installworld. This is > part of > > > the logic behind how $ITOOLS, etc, works. > > That would be in direct conflict with how preceding tools > worked, INSTALL?=install has been there for a very very long time > and any direct invoke of install in our Makefile/.mk files is just wrong, > and for the very reasoning that Max is trying to do. > > I made the mistake of following someone else earlier that thought > it was INSTALL that was undefined, and as we known now that was > not the case, it was MTREE_CMD that was undefined, and that is > less clear, as iirc when that was originally done mtree was > contained soly in src/etc/Makefile by design. It appears as > if that hos how crept up directly into head/Makefile.inc1, and > the definition for MTREE_CMD?= did not get moved to a more > appropriate place. > > > > Thank you very much for your work and the rest of the change > though! > > > > > > > Thanks Enji, for a clarification, will do. I still cannot understand why > > can't we have those tools being re-defined with top-level make > environment? > > You should and must be able to do this. > Especially for INSTALL, I fully support that part of this change staying. > > > What I am striving at is being able to do say, make INSTALL="abcd" > > installworld. Yes, I understand I can call "abcd" "install" (or make a > > symlink to it) and put it into PATH, but there are at least one issue > here, > > namely what if I need to pass some distinct argument to abcd based on > usage > > scenario. E.g. make INSTALL="abcd foo" distributiuon. In your case I > should > > be resorting to setting up some global environment variable and hope it > > won't get erased somewhere in the call chain, but that's bit "how you > > doing" IMHO. My approach makes certain things so much easier by cutting > > those un-neded steps. > > > > At any rate thank for a feedback and some background info, I will do more > > work on this. I was thinking more in terms of having some sort of > > bsd.bootools.mk where this can be defined in a centralized manner. > > > > -Max > > -- > Rod Grimes > rgrimes@freebsd.org > >