Date: Thu, 7 Nov 2024 19:19:13 -0800 From: Warner Losh <imp@bsdimp.com> To: Jessica Clarke <jrtc27@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: d2434697bc9c - main - loader.kboot: Build on amd64 Message-ID: <CANCZdfpNNoftfcLQBWiv8YR45sEE=8XoR7VU083Un=Qnw4e22A@mail.gmail.com> In-Reply-To: <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> References: <202411080059.4A80xv9q000454@gitrepo.freebsd.org> <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thu, Nov 7, 2024, 5:03 PM Jessica Clarke <jrtc27@freebsd.org> wrote: > On 8 Nov 2024, at 00:59, Warner Losh <imp@FreeBSD.org> wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=d2434697bc9cc2d36da0f356cc5942b33df87896 > > > > commit d2434697bc9cc2d36da0f356cc5942b33df87896 > > Author: Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2024-11-07 22:59:04 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > CommitDate: 2024-11-07 23:23:26 +0000 > > > > loader.kboot: Build on amd64 > > > > But comment out FDT stuff for amd64 built inside kboot. This also > > restricts a bit the powerpc platforms we build on to powerpc64. > > > > Sponsored by: Netflix > > --- > > stand/Makefile | 2 +- > > stand/kboot/kboot/Makefile | 5 ++++- > > stand/kboot/kboot/main.c | 5 ++++- > > 3 files changed, 9 insertions(+), 3 deletions(-) > > > > diff --git a/stand/Makefile b/stand/Makefile > > index ce91802d4a8b..5d81e5f8a032 100644 > > --- a/stand/Makefile > > +++ b/stand/Makefile > > @@ -37,7 +37,7 @@ INTERP_DEPENDS+= lua > > .include <bsd.arch.inc.mk> > > > > S.${MK_EFI}+= efi > > -.if ${MK_FDT} != "no" > > +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || > ${MACHINE_ARCH} == "powerpc64" > > S.${MK_LOADER_KBOOT}+= kboot > > .endif > > Hm, is the outer if really needed? We already have: > > # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64 > .if ${__T} != "powerpc64" && ${__T} != "amd64" && ${__T} != “aarch64" > BROKEN_OPTIONS+=LOADER_KBOOT > .endif > > in src.opts.mk, which is generally where these kinds of restrictions > should live. > Oh. That's a great idea. I'll update. Warner > [-- Attachment #2 --] <div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Nov 7, 2024, 5:03 PM Jessica Clarke <<a href="mailto:jrtc27@freebsd.org">jrtc27@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 8 Nov 2024, at 00:59, Warner Losh <imp@FreeBSD.org> wrote:<br> > <br> > The branch main has been updated by imp:<br> > <br> > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=d2434697bc9cc2d36da0f356cc5942b33df87896" rel="noreferrer noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=d2434697bc9cc2d36da0f356cc5942b33df87896</a><br>; > <br> > commit d2434697bc9cc2d36da0f356cc5942b33df87896<br> > Author: Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2024-11-07 22:59:04 +0000<br> > Commit: Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2024-11-07 23:23:26 +0000<br> > <br> > loader.kboot: Build on amd64<br> > <br> > But comment out FDT stuff for amd64 built inside kboot. This also<br> > restricts a bit the powerpc platforms we build on to powerpc64.<br> > <br> > Sponsored by: Netflix<br> > ---<br> > stand/Makefile | 2 +-<br> > stand/kboot/kboot/Makefile | 5 ++++-<br> > stand/kboot/kboot/main.c | 5 ++++-<br> > 3 files changed, 9 insertions(+), 3 deletions(-)<br> > <br> > diff --git a/stand/Makefile b/stand/Makefile<br> > index ce91802d4a8b..5d81e5f8a032 100644<br> > --- a/stand/Makefile<br> > +++ b/stand/Makefile<br> > @@ -37,7 +37,7 @@ INTERP_DEPENDS+= lua<br> > .include <<a href="http://bsd.arch.inc.mk" rel="noreferrer noreferrer" target="_blank">bsd.arch.inc.mk</a>><br> > <br> > S.${MK_EFI}+= efi<br> > -.if ${MK_FDT} != "no"<br> > +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "powerpc64"<br> > S.${MK_LOADER_KBOOT}+= kboot<br> > .endif<br> <br> Hm, is the outer if really needed? We already have:<br> <br> # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64<br> .if ${__T} != "powerpc64" && ${__T} != "amd64" && ${__T} != “aarch64"<br> BROKEN_OPTIONS+=LOADER_KBOOT<br> .endif<br> <br> in <a href="http://src.opts.mk" rel="noreferrer noreferrer" target="_blank">src.opts.mk</a>, which is generally where these kinds of restrictions<br> should live.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Oh. That's a great idea. I'll update.</div><div dir="auto"><br></div><div dir="auto">Warner</div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> </blockquote></div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpNNoftfcLQBWiv8YR45sEE=8XoR7VU083Un=Qnw4e22A>