From nobody Fri Nov 08 01:03: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 4Xl10J259Gz5cxtS for ; Fri, 08 Nov 2024 01:03:28 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 4Xl10H6sRZz4WY2 for ; Fri, 8 Nov 2024 01:03:27 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-37d43a9bc03so1080159f8f.2 for ; Thu, 07 Nov 2024 17:03:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731027806; x=1731632606; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cqe0i+libYJxUEt7XbFY+ueSoe58woMK7aY8Cram6LI=; b=h8CKYwFTS8ZQShP033XHHv0ytLNK7k5CDrLrbUSK+DBbvpC/qHk+YKAiB/JqW+xcky he7S4IrKULvHgu/3xbTleoxhZswSAtltoSbDK4J1U8493i4t9tg56xkntyi9TqbLU17D 7i27/ZrDpxutSsFSQVYcfdN9ou63CbFvGkplIDAZlTdlGz5+WNd23b8dsAfQLH1Wy0av whTpS7ATyfpm58qWf2yTD5cWe+4oPo2pJ6uRbDCiMCOILmzkc5BJBXYYHvV7kivuMp8A J9sFZGonTxZHUmqtQNlsRodCFPuLyy2HkiKltBaOsp0Nuap51M0DU+CH2fa8I8YYEICT 9wTA== X-Forwarded-Encrypted: i=1; AJvYcCUbW3XcG/FF2AtNWkTycVcK3WvRxFFl56NKp7xIzhtBaCCpiNQoGtsGW3T1nM5KmFjm9qGu7bQflCqDXhulGkx1H/C5@freebsd.org X-Gm-Message-State: AOJu0YyPWHMEA51sRRqcnIDMCqRHDjUaxmHpagM9GuAb5H3WYWKEZIMf duT+BsVUx0fAGcTdcPldDyvvapOfGlOvyS0ZM8uefDz/hyKyQIBKOa4iLjZVFVE= X-Google-Smtp-Source: AGHT+IHJ6Htb6QIkz/Tlbe0yucKQbgbVyGH7uzRJtJ4i3S4LlD7iwtIX495GLE7h748f+OBfv/SiTw== X-Received: by 2002:a5d:5886:0:b0:37d:4a7b:eeb2 with SMTP id ffacd0b85a97d-381f186d34amr748975f8f.35.1731027806424; Thu, 07 Nov 2024 17:03:26 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381ed9ea6b5sm3107480f8f.84.2024.11.07.17.03.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Nov 2024 17:03:25 -0800 (PST) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3818.100.11.1.3\)) Subject: Re: git: d2434697bc9c - main - loader.kboot: Build on amd64 From: Jessica Clarke In-Reply-To: <202411080059.4A80xv9q000454@gitrepo.freebsd.org> Date: Fri, 8 Nov 2024 01:03:13 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> References: <202411080059.4A80xv9q000454@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3818.100.11.1.3) 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:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Xl10H6sRZz4WY2 X-Spamd-Bar: ---- On 8 Nov 2024, at 00:59, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd2434697bc9cc2d36da0f356cc5942b3= 3df87896 >=20 > commit d2434697bc9cc2d36da0f356cc5942b33df87896 > Author: Warner Losh > AuthorDate: 2024-11-07 22:59:04 +0000 > Commit: Warner Losh > CommitDate: 2024-11-07 23:23:26 +0000 >=20 > loader.kboot: Build on amd64 >=20 > But comment out FDT stuff for amd64 built inside kboot. This also > restricts a bit the powerpc platforms we build on to powerpc64. >=20 > Sponsored by: Netflix > --- > stand/Makefile | 2 +- > stand/kboot/kboot/Makefile | 5 ++++- > stand/kboot/kboot/main.c | 5 ++++- > 3 files changed, 9 insertions(+), 3 deletions(-) >=20 > 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 >=20 > 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. Jess