From nobody Fri Nov 08 03:19:13 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xl41C0ycGz5bxLM for ; Fri, 08 Nov 2024 03:19:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xl41B4M9Bz4mb6 for ; Fri, 8 Nov 2024 03:19:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7240fa50694so759565b3a.1 for ; Thu, 07 Nov 2024 19:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1731035965; x=1731640765; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=UYkc1vIHtZefaNuKlZGOBiwEmWF+usbINxZ0HihKSaE=; b=jGum1v0+tjlPyvVxmSdaMKyV8I+/SrbuJrTH93R58pyihPXfbrY2yb8xqANRT9yaFx v/ZaAMGk+7sCqZgdk/bBlNhlWrXdMYypPUV7WICtwdAdMlxMbXDYydgrmcVgzfTjHoYL Bylb1YBkkc3KtXi/b46kJn/uMa5CKLi46rcvcxy6i0q/QLuM1VxxShSWKNaQbSpnooGQ isRfpgDOJ4ZAER13gHX7GIdsLwhHmDe7ro3aGiiUloUugG34UQw+IJFDI+PX+1OSsZB7 ZPuTfryzfDXImE6E8uWXpw5iVF01Gcte/vDVDLL2OboNO0VX76gmkUWrUdzyPSBG3srq erxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731035965; x=1731640765; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UYkc1vIHtZefaNuKlZGOBiwEmWF+usbINxZ0HihKSaE=; b=Ecee+jGnTblLVB+Nd3ufgN3K0/PlNEcmDSWYIUa8DH1EOVIzqpQE2gA+V99en+x9Bb ymsA+o3KH5pk8X+X85emTx7unc2dDrDz697zPKuh5QqYIFDxmv/BzXllkdmGzWDRwYSU A+DgjD0iT6x5BYOz35yLfAc6nR7htoIIPEEnWA5FlFn3GTq5vwtocHhCXIf/mowPcPZu 4jgMbURKNMH514eVYjEm+244bzMbSgeLUahtYODkrB9ECrhCft15xJ4KNRZyLgna2LUW KqQOX4pu5vXqyf2N1OvcVhWbIyYGx1VKWwKpcOO/YuoELtK2pU/oUhynv5Ub/+ygY84S KM2Q== X-Forwarded-Encrypted: i=1; AJvYcCXTRWaj4tKjBmiuTnQjVN/7JBRzYutUi0u0MJY5fG/BGHAqFHs3gVwQAcnunU/YAJuOOmRpSoo3gpmcL2qToDkfEijB@freebsd.org X-Gm-Message-State: AOJu0YyOZcVfpI74W12mPXUVM3jFgKucC880Ll6yYjxtgoLx+C0C3djs yiNDgFEaJDnH3jQLdT95ZGI8RW3SMuzTw1pZxtIbva14/XkS7qmPEG6VZCvEWaYaEqMqjnk3qiI eUJ/wX/RfRucI8IF/y4vJ27g/sRC/EGyoVrf1u7Vbor/aDowL X-Google-Smtp-Source: AGHT+IGys9WFYQc6wKC7kFDxDW9yb86aBekbsa7XfvCwdyK+udzssVqK9nsPTkB8KhSWyb0i2IvhoDj72UC+JHIyLSc= X-Received: by 2002:a05:6a21:999f:b0:1db:d84f:c7d8 with SMTP id adf61e73a8af0-1dc228c6919mr1973539637.2.1731035965326; Thu, 07 Nov 2024 19:19:25 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202411080059.4A80xv9q000454@gitrepo.freebsd.org> <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> In-Reply-To: <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> From: Warner Losh Date: Thu, 7 Nov 2024 19:19:13 -0800 Message-ID: Subject: Re: git: d2434697bc9c - main - loader.kboot: Build on amd64 To: Jessica Clarke Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000cea0c506265e3729" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Xl41B4M9Bz4mb6 X-Spamd-Bar: ---- --000000000000cea0c506265e3729 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Nov 7, 2024, 5:03=E2=80=AFPM Jessica Clarke wr= ote: > On 8 Nov 2024, at 00:59, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dd2434697bc9cc2d36da0f356cc5942b= 33df87896 > > > > commit d2434697bc9cc2d36da0f356cc5942b33df87896 > > Author: Warner Losh > > AuthorDate: 2024-11-07 22:59:04 +0000 > > Commit: Warner Losh > > 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+=3D lua > > .include > > > > S.${MK_EFI}+=3D efi > > -.if ${MK_FDT} !=3D "no" > > +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D=3D "aarch64"= || > ${MACHINE_ARCH} =3D=3D "powerpc64" > > S.${MK_LOADER_KBOOT}+=3D kboot > > .endif > > Hm, is the outer if really needed? We already have: > > # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64 > .if ${__T} !=3D "powerpc64" && ${__T} !=3D "amd64" && ${__T} !=3D =E2= =80=9Caarch64" > BROKEN_OPTIONS+=3DLOADER_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 > --000000000000cea0c506265e3729 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Nov 7, 2024, 5:03=E2=80=AFPM Jessica Clarke &l= t;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=3Dd2434697bc9cc2d36da0f356cc5942= b33df87896
>
> commit d2434697bc9cc2d36da0f356cc5942b33df87896
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-11-07 22:59:04 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-11-07 23:23:26 +0000
>
>=C2=A0 =C2=A0 loader.kboot:=C2=A0 Build on amd64
>
>=C2=A0 =C2=A0 But comment out FDT stuff for amd64 built inside kboot. T= his also
>=C2=A0 =C2=A0 restricts a bit the powerpc platforms we build on to powe= rpc64.
>
>=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0Net= flix
> ---
> stand/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +- > stand/kboot/kboot/Makefile | 5 ++++-
> stand/kboot/kboot/main.c=C2=A0 =C2=A0| 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+=3D lua
> .include <bsd.arch.inc.mk>
>
> S.${MK_EFI}+=3D efi
> -.if ${MK_FDT} !=3D "no"
> +.if ${MACHINE_ARCH} =3D=3D "amd64" || ${MACHINE_ARCH} =3D= =3D "aarch64" || ${MACHINE_ARCH} =3D=3D "powerpc64"
> S.${MK_LOADER_KBOOT}+=3D kboot
> .endif

Hm, is the outer if really needed? We already have:

=C2=A0 # KBOOT is only for powerpc64 (powerpc64le broken) amd64 and aarch64=
=C2=A0 .if ${__T} !=3D "powerpc64" && ${__T} !=3D "a= md64" && ${__T} !=3D =E2=80=9Caarch64"
=C2=A0 BROKEN_OPTIONS+=3DLOADER_KBOOT
=C2=A0 .endif

in src.opts.mk, which is generally where these kinds of restriction= s
should live.

Oh. That's a great idea. I'll update.

Warner
--000000000000cea0c506265e3729--