From owner-svn-src-all@freebsd.org Mon Jun 3 19:03:58 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 3AB4E15BABC3; Mon, 3 Jun 2019 19:03:58 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 867A16A01B; Mon, 3 Jun 2019 19:03:57 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x53J3tXr044252; Mon, 3 Jun 2019 12:03:55 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x53J3tQq044251; Mon, 3 Jun 2019 12:03:55 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201906031903.x53J3tQq044251@gndrsh.dnsmgr.net> Subject: Re: svn commit: r348532 - in head: . etc In-Reply-To: <201906031512.x53FCjHh066558@repo.freebsd.org> To: Maxim Sobolev Date: Mon, 3 Jun 2019 12:03:55 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 867A16A01B X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Mon, 03 Jun 2019 19:03:58 -0000 > Author: sobomax > Date: Mon Jun 3 15:12:44 2019 > New Revision: 348532 > URL: https://svnweb.freebsd.org/changeset/base/348532 > > Log: > Leave mtree hardcoded for now. Reverting partially 348521 and also > the followup stopgap change, because I don't think it's a correct. I still > need to figure out where to stick it in. In cannot be in Makefile.inc1 > and it cannot be in etc/Makefile from the looks of it to avoid > chicken-and-egg problem. A quick and incomplete look at this leads me to believe that much of the mtree related stuff in src/Makefile.inc1 should of been in src/etc in the first place. It ends up invoking etc/Makefile in the end anyway. Can someone explain why this is pulled up a level? Why do we now have distrib-dirs, distribution in src/Makefile.inc1, these were and should be in etc/Makefile? iirc hierarchy was pulled up to src/Makefile at one point, but forgetting the reasoning for that. > Modified: > head/Makefile.inc1 > head/etc/Makefile > > Modified: head/Makefile.inc1 > ============================================================================== > --- head/Makefile.inc1 Mon Jun 3 15:10:37 2019 (r348531) > +++ head/Makefile.inc1 Mon Jun 3 15:12:44 2019 (r348532) > @@ -888,7 +888,7 @@ INSTALLFLAGS+= -h sha256 > .endif > .if defined(DB_FROM_SRC) || defined(NO_ROOT) > IMAKE_INSTALL= INSTALL="${INSTALL} ${INSTALLFLAGS}" > -IMAKE_MTREE= MTREE_CMD="${MTREE} ${MTREEFLAGS}" > +IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}" > .endif > > DESTDIR_MTREEFLAGS= -deU > > Modified: head/etc/Makefile > ============================================================================== > --- head/etc/Makefile Mon Jun 3 15:10:37 2019 (r348531) > +++ head/etc/Makefile Mon Jun 3 15:12:44 2019 (r348532) > @@ -93,8 +93,6 @@ distribution: > .endif > .endif > > -MTREE_CMD?= mtree > - > MTREES= mtree/BSD.root.dist / \ > mtree/BSD.var.dist /var \ > mtree/BSD.usr.dist /usr \ > > -- Rod Grimes rgrimes@freebsd.org