From nobody Fri Nov 08 15:09:51 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 4XlMn20YgKz5cN8q; Fri, 08 Nov 2024 15:09:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XlMn203n4z4gGc; Fri, 8 Nov 2024 15:09:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731078598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DUBps9LHPogNg+DXKT07RWCy0DAwIHuivPcg6p4jNSA=; b=GQhEcyoNJKdZ2L7DXFtVvhQCE+oMebnMmoUoMx73gmtQuwZ2xccRSbkIjQmLDXHSprAZMw 7aRIEzmg4FIk7qYjkOILVbU/ViwZzKjRc0Y4Y6cLOpkBx4k34HVRr7WWYBev1bCDk5bb+l TwKVVz5M471iMp0vUEgv02Ss+ChIoq/BesZ7OywkUjitOMO10qT4xBEtkurGrtVR/LQjVj l8CvwYgZbMmB7nxg+KxrTljJdBPiAYLMrsr6up2TIvpnGEL3XLfbYou5lB8w0CznL72NhB 6OooKIxRKcw5weQ921aJ7VfdT9BZE+D4l8EqFR6myjkdeop13INEWEsJc4NUsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731078598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DUBps9LHPogNg+DXKT07RWCy0DAwIHuivPcg6p4jNSA=; b=ICZCojaGg7JTSyoxrtjeRnodwh8MuMqepU4i2R0FbeZQzGJ6nee1DXklVOOoUhQdT5EY6B ZAbVY+IqDvd1HI5/or8bfqT0AK/I9qpnHHkMeencZu/QOfqQn7g3KyUuFg+mhLIOojsk4n mMYaXtrUIon8MMjHYjbe40ljBchi10KT+3uyxAl6062VHbPNmKixVtR+iCuD8+fHu2LTaw y1SHaLJCdx8p1hnSt/t16j12URj+nK6TPO+/xJwhnPLz7+pVxvaRV9+ataL/FGZe6+NGct Wq7SHgqXeqFizmPOvKeKODgfpawMXz8jkNjwoDzWdVl3BdeLjlCmdM+Q0kFfXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731078598; a=rsa-sha256; cv=none; b=cE7OMMu68+AGhXmn4/6gBTjmlk/YO5aeaV+OOTk07u5aQ40MH/7aQpt/DUY+MTdH5cYeww O7FwNqVr6nv4oQlUkOfWew/g8hskMeZ8wSjvR5xK2OGEGWXrvdDSbLF3FlI8USttNuqOhJ FHMLx7pIk0vKXZZyPXVYgS1DAyTf3zR2rPSEdI8j50R1LIKQ1XShlZTXN+/ZqXJ5X7GMuC jxithKdbwa9F+vU2JZnVO7pCSfr4h3WO7teuouMq28aAzfsaJy+r3pXNkyXKHPDSWAWoNI yv7Ce3jcPnfwyDv3qC3CyPsdSthvEFOBhrniy9HKa8LuBBgS4LutLzh8G+x4XA== Received: from [10.9.4.95] (unknown [209.182.120.176]) (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 did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XlMmz1x99zftQ; Fri, 8 Nov 2024 15:09:55 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Fri, 8 Nov 2024 09:09:51 -0600 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 User-Agent: Mozilla Thunderbird Subject: Re: git: d2434697bc9c - main - loader.kboot: Build on amd64 To: Jessica Clarke , Warner Losh Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202411080059.4A80xv9q000454@gitrepo.freebsd.org> <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> Content-Language: en-US From: Kyle Evans In-Reply-To: <5B288C0C-5A9A-4772-8B14-06BDCC527B04@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 11/7/24 19:03, Jessica Clarke wrote: > 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=d2434697bc9cc2d36da0f356cc5942b33df87896 >> >> 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+= lua >> .include >> >> 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. > I had the same thought about the BHYVE option the other day... it'd be useful if we BROKEN_OPTION'd it so that MK_BHYVE is accurate on platforms that don't support it. The particular context where it would've been nice is depend-cleanup.sh, since we could've used it as a heuristic to nuke the errant include dirs if the option was properly disabled. Thanks, Kyle Evans