From nobody Tue Jan 24 22:09:42 2023 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 4P1h3C1KWZz3bdlS; Tue, 24 Jan 2023 22:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h3C0Zzjz4GZC; Tue, 24 Jan 2023 22:09:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VR+mzBJZgRKlAl83b3WWXfp/E+8+9NX20zwuerv73c=; b=Nl678a9dOzP1mnVeZ83J5VMHlSTXKmrCKYRzW50ypzVybamsXA8Rhlkgh2qBo49kY+Z1mM sdVhmwU0C/0aF54QAB/tjaL3qt9vRKsIhqd1PXP6GmM4HQj7dU5EdWeeEdUD5fiDmqOpUv tgOVNnZvL72unHphjluaybXyXL+Rq8MydEFTEplmgiE8BvdEpwu2jGBEFiFqthW84/KYob Ppj4AgT6Uiry9GmMZI0kN5fkOC9W7TnYbLUsop4UPcu/KxWolGtHOAtXVeoHbNoW7Y2Pag yIw0W91+Ka5QZl5LD6AULNSUcSDxUGFqjeYTVxKu0V+CQW05APa0JwDD9dTslQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4VR+mzBJZgRKlAl83b3WWXfp/E+8+9NX20zwuerv73c=; b=XE+WvzpXm7kOPWZd4YcAUhmDAWVD0nHnKXggWeGRMeW58Z9Pgyzvgw645SiNTwttvq5yyg mF2pGYsBgGcDaf1a9OpnAktmZaqOXnSuyd5P1OquTbZq/sU8t38PjSOSBT5AkeZc7GHqrp EspaBXiyUJ/4hd6r8rIHLojm3Ub4FVZJZgsDfPJQn/vQMNAc2B2LHwLQgTqsdEMFOyX88b 0/PKsMjZCC83zrZXd/vdzFJ2j0I3R3HjR2gSZzgneupyT0yYWR0aq2Uaxpga0s3lVQZ1LN NmlrSx5bySGdL1MJejGp69d9YdnVWaTsOvvx6fDl403ur9UiVz3J7jd0hnhmwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598183; a=rsa-sha256; cv=none; b=axpcCiiZ4Mq0cJj3yAwoTu57epmsCQy5g5/gCxjuNkLJJu2KOR1puE5fCIUWuOOp0UNlPt +LQYhGlA8PPT3Ube8bWOo4ZAl7YkHBGdqPAK3KfSjxk07ruLwwyqswp2V9R/TeIux0Bhq8 RN1pDYf2jiAwu1s1Edc3xzpyD3dUgx4hI2myRFIgFqIaB4EiA/HDdE1aARCEWYwzeaQeLy 2PsJHTthO9KONe5p4+vb4FyQFlgLaVHW3MyK74axtIr1VLZXYS0ZLIGXz41yspBQa5X2Hj 7jz8nqnVXCSh8XRpv3+vTC8OG8vaWwgZtCiXTL6fIMei/AelBtAUDGYeAg/f0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h3B6jgmzQQj; Tue, 24 Jan 2023 22:09:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OM9gPa070557; Tue, 24 Jan 2023 22:09:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OM9gRl070556; Tue, 24 Jan 2023 22:09:42 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:09:42 GMT Message-Id: <202301242209.30OM9gRl070556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e1c95a0233c6 - stable/13 - bi_load: only add MODULEP on arches that have it defined 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e1c95a0233c646db795a98638093525392fc9b9b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e1c95a0233c646db795a98638093525392fc9b9b commit e1c95a0233c646db795a98638093525392fc9b9b Author: Roger Pau Monné AuthorDate: 2021-02-16 15:06:14 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:16 +0000 bi_load: only add MODULEP on arches that have it defined Do not attempt to add MODINFOMD_MODULEP to the kernel medatada on arches that don't have it defined. This fixes the build for arches different than amd64 after 7d3259775cb69f250df3e7fe51d6fff2283c6f20. Sponsored by: Citrix Systems R&D Reported by: lwhsu, arichardson (cherry picked from commit 97527e9c4fd37140da3129bc12003172edbf7a23) --- stand/efi/loader/bootinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 74be4f8f5d74..046d56a2b4fb 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -533,7 +533,9 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) "device tree blob found!\n"); #endif file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof(kernend), &kernend); +#ifdef MODINFOMD_MODULEP file_addmetadata(kfp, MODINFOMD_MODULEP, sizeof(module), &module); +#endif file_addmetadata(kfp, MODINFOMD_FW_HANDLE, sizeof(ST), &ST); #ifdef LOADER_GELI_SUPPORT geli_export_key_metadata(kfp);