From owner-svn-src-head@freebsd.org Sat Jun 16 05:02:24 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 879CE1009C14; Sat, 16 Jun 2018 05:02:24 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id E48D07430A; Sat, 16 Jun 2018 05:02:23 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id U3Lqfpjmx5wO5U3LrfrPN0; Fri, 15 Jun 2018 23:02:16 -0600 X-Authority-Analysis: v=2.3 cv=SJtsqtnH c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=kj9zAlcOel0A:10 a=7mUfYlMuFuIA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=pFPmQLvFyrIsco2Ow2sA:9 a=CjuIK1q_8ugA:10 a=tPJkxjwt9L8A:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 6CDB213E; Fri, 15 Jun 2018 22:02:13 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id w5G52DRR039777; Fri, 15 Jun 2018 22:02:13 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id w5G52CIO039774; Fri, 15 Jun 2018 22:02:12 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201806160502.w5G52CIO039774@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Bryan Drewery , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r335244 - head In-Reply-To: Message from Cy Schubert of "Fri, 15 Jun 2018 21:36:33 -0700." <201806160436.w5G4aXks039566@slippy.cwsent.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 15 Jun 2018 22:02:12 -0700 X-CMAE-Envelope: MS4wfPKXFvWvflrV/41Mddlo+XgOs3dUuGc2qeftDXLeNsYsCqrEPLTWF4GN15rxmysxeOGTB+xqhwxA2osvrSpcANJg1Dxymn2PxB8cmoGn/gTg4sKkt6Fz queUxDTuOZddA7edCsTwAPDC4YjhObYkEAzTuLDjOfbvu041hH9iP8TZRUoC6dCIe/cXqYekOdGDQjjcXe+GZKGLrIwgAPzOxy5WUgxH+dxK5TqpSLlOpoS5 EAOCr7+hZ0FGDnka+sGqspSrNCScV4iDYLPX9+pEZUurK8h3JEkSAv3v3U4hz68c X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 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: Sat, 16 Jun 2018 05:02:24 -0000 In message <201806160436.w5G4aXks039566@slippy.cwsent.com>, Cy Schubert writes: > In message <201806160035.w5G0ZJfd066325@repo.freebsd.org>, Bryan > Drewery writes > : > > Author: bdrewery > > Date: Sat Jun 16 00:35:19 2018 > > New Revision: 335244 > > URL: https://svnweb.freebsd.org/changeset/base/335244 > > > > Log: > > Assert that a build is done before an install. > > > > This should also catch cases where the wrong MAKEOBJDIRPREFIX is used for > > install. > > > > MFC after: 2 weeks > > Sponsored by: Dell EMC > > > > Modified: > > head/Makefile.inc1 > > > > Modified: head/Makefile.inc1 > > =========================================================================== > == > > = > > --- head/Makefile.inc1 Fri Jun 15 23:42:22 2018 (r335243) > > +++ head/Makefile.inc1 Sat Jun 16 00:35:19 2018 (r335244) > > @@ -89,7 +89,10 @@ MK_GCC_BOOTSTRAP= no > > .if make(installworld) || make(install) || make(distributeworld) || \ > > make(stageworld) > > .-include "${OBJTOP}/compiler-metadata.mk" > > +.if !defined(_LOADED_COMPILER_METADATA) > > +.error A build is required first. You may have the wrong MAKEOBJDIRPREFIX > s > > et. > > .endif > > +.endif > > > > # Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. Pull it from t > he > > # tree to be friendlier to foreign OS builds. It's safe to do so unconditi > on > > ally > > @@ -195,6 +198,7 @@ compiler-metadata.mk: .PHONY .META > > @: > ${.TARGET} > > @echo ".info Using cached compiler metadata from build at $$(hostname) > > on $$(date)" \ > > > ${.TARGET} > > + @echo "_LOADED_COMPILER_METADATA=t" >> ${.TARGET} > > .for v in ${_COMPILER_METADATA_VARS} > > @echo "${v}=${${v}}" >> ${.TARGET} > > .endfor > > > > Another data point: This also broke the following: > > cwsys# poudriere jail -c -m src=/opt/src/svn-current -j HEADi386 -a i386 > [00:00:00] Creating HEADi386 fs at /poudriere/amd64/jails/HEADi386... > done > [00:00:01] Copying /opt/src/svn-current to /poudriere/amd64/jails/HEADi3 > 86/usr/src... done > [00:06:01] Starting make installworld > --- installworld --- > make[1]: "/export/obj/opt/src/svn-current/i386.i386/compiler-metadata.mk > " line 1: Using cached compiler metadata from build at cwsys on Fri Jun > 15 18:39:46 PDT 2018 > make[1]: "/opt/src/svn-current/Makefile.inc1" line 93: A build is > required first. You may have the wrong MAKEOBJDIRPREFIX set. > *** [installworld] Error code 1 > > make: stopped in /opt/src/svn-current > 1 error > > make: stopped in /opt/src/svn-current > [00:06:01] Error: Failed to 'make installworld' > [00:06:01] Error while creating jail, cleaning up. > [00:06:01] Removing HEADi386 jail... done > [00:06:03] Cleaning HEADi386 data... done > cwsys# Nevermind. I found it. Stupid error on my part. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.