From owner-freebsd-current@freebsd.org Tue Apr 18 23:05:36 2017 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01C36D44F06 for ; Tue, 18 Apr 2017 23:05:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id D0F5D9AC for ; Tue, 18 Apr 2017 23:05:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: by mailman.ysv.freebsd.org (Postfix) id CD21ED44F04; Tue, 18 Apr 2017 23:05:35 +0000 (UTC) Delivered-To: current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB0E6D44F03 for ; Tue, 18 Apr 2017 23:05:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CD1D9AB; Tue, 18 Apr 2017 23:05:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 6A730B74; Tue, 18 Apr 2017 23:05:34 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 13EAD55E0; Tue, 18 Apr 2017 23:05:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id Xy_pZ3bfJdcR; Tue, 18 Apr 2017 23:05:30 +0000 (UTC) Subject: Re: buildkernel broken for META_MODE DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 5789855DB To: "Simon J. Gerraty" References: <11023f9a-f057-4306-6d27-69194395de58@FreeBSD.org> <37722.1492551184@kaos.jnpr.net> <8a4e0cd6-c494-3222-f166-bc424d6d2873@FreeBSD.org> <38914.1492554405@kaos.jnpr.net> Cc: "Ngie Cooper (yaneurabeya)" , FreeBSD Current From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: Date: Tue, 18 Apr 2017 16:05:09 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <38914.1492554405@kaos.jnpr.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ROuOG9GoC6PHBCAn0cDTSr0WqgUfOLxGJ" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2017 23:05:36 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --ROuOG9GoC6PHBCAn0cDTSr0WqgUfOLxGJ Content-Type: multipart/mixed; boundary="KSc3S0kIWw4INCn2s6BwfVbVVJL2TwAWB"; protected-headers="v1" From: Bryan Drewery To: "Simon J. Gerraty" Cc: "Ngie Cooper (yaneurabeya)" , FreeBSD Current Message-ID: Subject: Re: buildkernel broken for META_MODE References: <11023f9a-f057-4306-6d27-69194395de58@FreeBSD.org> <37722.1492551184@kaos.jnpr.net> <8a4e0cd6-c494-3222-f166-bc424d6d2873@FreeBSD.org> <38914.1492554405@kaos.jnpr.net> In-Reply-To: <38914.1492554405@kaos.jnpr.net> --KSc3S0kIWw4INCn2s6BwfVbVVJL2TwAWB Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 4/18/2017 3:26 PM, Simon J. Gerraty wrote: >>> [Creating objdir /usr/obj/usr/obj/root/git/freebsd/sys/GENERIC...] >> Wrong^ >> >> Note we have 'cd /usr/obj/....' and 'MAKEOBJDIRPREFIX=3D/usr/obj' in >> there, so we get a nested /usr/obj/.CURDIR problem of /usr/obj/usr/obj= =2E >=20 > The following would probably help that case: >=20 > Index: auto.obj.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /volume/cvs/sjg/mk/auto.obj.mk,v > retrieving revision 1.13 > diff -u -p -r1.13 auto.obj.mk > --- auto.obj.mk 24 Mar 2017 20:53:22 -0000 1.13 > +++ auto.obj.mk 18 Apr 2017 22:25:08 -0000 > @@ -41,6 +41,10 @@ MKOBJDIRS=3D auto > # Use __objdir here so it is easier to tweak without impacting > # the logic. > .if !empty(MAKEOBJDIRPREFIX) > +.if ${.CURDIR:M${MAKEOBJDIRPREFIX}/*} !=3D "" > +# we are already in obj tree! > +__objdir?=3D ${.CURDIR} > +.endif > __objdir?=3D ${MAKEOBJDIRPREFIX}${.CURDIR} > .endif > __objdir?=3D ${MAKEOBJDIR:Uobj} >=20 Yes this looks right and fixes buildkernel completely. --=20 Regards, Bryan Drewery --KSc3S0kIWw4INCn2s6BwfVbVVJL2TwAWB-- --ROuOG9GoC6PHBCAn0cDTSr0WqgUfOLxGJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJY9pulAAoJEDXXcbtuRpfPoAYIALHwY0JBtuPPHB4+b6HOnjoL 2iTgnB/GCH44+ppVRyobLIqRwIW6p7ilQ7VUW5FLaPP95tOV8dRm8y11hGxVpEFl 4oW8vRcUgXiqxIOtOkpxcEmSNxeSEbIkLzp2YCCBdQGEHw90+ldUDxceDYk4LNVM gcgfysxzCkh38ll1r4B1wYKcmyS1KRYiCWQsIxaY3h4/LkZxvEzXCPlsgUq7y1gZ uhaF2vsiJGFMeGVOcA2UEYDzmJsA/9Rz/D2i+ipTLal+dgtPzwKEB+zCIgjfcSx6 FlJ098EH+GMbWsLpsv+JzwO+mu00NV+EWjm7o+X1lf2XDdhuy+74g90/3wzdc+s= =6b7M -----END PGP SIGNATURE----- --ROuOG9GoC6PHBCAn0cDTSr0WqgUfOLxGJ--