Date: Tue, 18 Apr 2017 16:05:09 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "Simon J. Gerraty" <sjg@juniper.net> Cc: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com>, FreeBSD Current <current@freebsd.org> Subject: Re: buildkernel broken for META_MODE Message-ID: <aeefa00d-adf5-8dbe-fcef-e670c7857598@FreeBSD.org> In-Reply-To: <38914.1492554405@kaos.jnpr.net> References: <D39E557A-D7B4-4285-95D9-9FD8F0D4F335@gmail.com> <d1700f26-b086-aefb-8f86-025a7481304c@FreeBSD.org> <11023f9a-f057-4306-6d27-69194395de58@FreeBSD.org> <37722.1492551184@kaos.jnpr.net> <8a4e0cd6-c494-3222-f166-bc424d6d2873@FreeBSD.org> <38914.1492554405@kaos.jnpr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--ROuOG9GoC6PHBCAn0cDTSr0WqgUfOLxGJ
Content-Type: multipart/mixed; boundary="KSc3S0kIWw4INCn2s6BwfVbVVJL2TwAWB";
protected-headers="v1"
From: Bryan Drewery <bdrewery@FreeBSD.org>
To: "Simon J. Gerraty" <sjg@juniper.net>
Cc: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com>,
FreeBSD Current <current@freebsd.org>
Message-ID: <aeefa00d-adf5-8dbe-fcef-e670c7857598@FreeBSD.org>
Subject: Re: buildkernel broken for META_MODE
References: <D39E557A-D7B4-4285-95D9-9FD8F0D4F335@gmail.com>
<d1700f26-b086-aefb-8f86-025a7481304c@FreeBSD.org>
<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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aeefa00d-adf5-8dbe-fcef-e670c7857598>