From owner-svn-src-all@freebsd.org Mon Jun 3 21:29:09 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 4316415BE97C; Mon, 3 Jun 2019 21:29:09 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 C273A7097A; Mon, 3 Jun 2019 21:29:08 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-io1-xd31.google.com with SMTP id h6so15625891ioh.3; Mon, 03 Jun 2019 14:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=kCEqiCzh2f3a6M3pgFJ+jsxNS1agAngv8U1lJ2Tt8kQ=; b=UEr9t5y2D45mfmG4Ogm7fAH6dGjs6Ve6zEuE4l+Yfk9myjuXkhGFR3ze8DASr4IRNK I0heziF0+VIV6yeE9MbktcRef6X2nWFMVm1aFRAEb59zbnEqgoUjyBJjdw/N0itWGRor XFS8lVx0uALIhg0J7ViPiTTselU0DI89uZaEm08ojRqSsEVlqIOl0wnuttoL0MDuCPcP g6e9Fw8M9I5AGlBrHBQoTQqZihxgFEdmQ9vDFjqD/GBECdmqFG57YgsL3jQqAytqbz84 qLJAMwWHMxKSkEbF483ME6JwmHE5KF0eKyz2EklDnBwJoF3Kwn85UlF5ArEksgoUgPeW NnzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=kCEqiCzh2f3a6M3pgFJ+jsxNS1agAngv8U1lJ2Tt8kQ=; b=iloti3cLz06lM/Hvj3446t2NU4H6roKJukl5kIb8uIHnENRv9/cmUQ++r2WdtsPtBI a5Gbzt7nz04xvTywrMMFUK5tvnKS3A3PPaXu16xtL/QGoVzWocjckrbmkj6+2T7io4Qy mDar66XYa5RP3KTpCchaGC1JoXWLA73a7z0H3Jez30LFkNn4xOBF3d/+QU5jCmWsdPQw tjSbH7xv6eXHqQgu3tDbfw5eE77L9HlBsDZNjWIkaXycJKU/lMW/XMIlx+r+yLm4e2+a Nb3JGhvw/qLqMpkD+57aPF/0ZTy89C57d2y+p1N8xfwZ1p+aX9c3YWZAn6bElj/9jvpB acvA== X-Gm-Message-State: APjAAAVrVQTQHF+TIAYx7KjSsJqmaViaJJm2bqQFnp8yifR8jLpf6HgD 0hTIoCtcgBuohbLCqBveDbkA/DAV X-Google-Smtp-Source: APXvYqyBj3aT6WMQlQQ/IYWtd2eqyQj1x2nOAfMSrf6/tUvYWuAd60IxJdcRKQhQadp33XtqVENDCg== X-Received: by 2002:a6b:4101:: with SMTP id n1mr18409533ioa.138.1559597347301; Mon, 03 Jun 2019 14:29:07 -0700 (PDT) Received: from raichu (toroon0560w-lp130-12-70-50-22-99.dsl.bell.ca. [70.50.22.99]) by smtp.gmail.com with ESMTPSA id m7sm4189032ith.34.2019.06.03.14.29.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 14:29:06 -0700 (PDT) Sender: Mark Johnston Date: Mon, 3 Jun 2019 17:29:04 -0400 From: Mark Johnston To: Maxim Sobolev Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r348532 - in head: . etc Message-ID: <20190603212904.GB54699@raichu> References: <201906031512.x53FCjHh066558@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201906031512.x53FCjHh066558@repo.freebsd.org> User-Agent: Mutt/1.11.4 (2019-03-13) X-Rspamd-Queue-Id: C273A7097A X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.974,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 21:29:09 -0000 On Mon, Jun 03, 2019 at 03:12:45PM +0000, Maxim Sobolev wrote: > 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. > > 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 > - I don't see how this can be right. Nothing sets MTREE_CMD if !defined(DB_FROM_SRC) && !defined(NO_ROOT), so now a regular installworld fails for me: -------------------------------------------------------------- >>> Making hierarchy -------------------------------------------------------------- cd /usr/home/markj/src/freebsd-dev; make -f Makefile.inc1 LOCAL_MTREE= hierarchy [...] -deU -i -f /usr/home/markj/src/freebsd-dev/etc/mtree/BSD.root.dist -p / /tmp/install.ClQih1mt/sh: -deU: not found *** Error code 127