From nobody Mon Nov 17 06:05:08 2025 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 4d8xzy36M7z6GdBJ for ; Mon, 17 Nov 2025 06:05:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (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 4d8xzx1wzwz3SF7 for ; Mon, 17 Nov 2025 06:05:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=Y8IAQx2A; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::1030) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-340bb1cb9ddso3393555a91.2 for ; Sun, 16 Nov 2025 22:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1763359515; x=1763964315; 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=pJIA99Ovhr5E9/GPOmcHIVHFt9ABVADqpCfcAcpZe5I=; b=Y8IAQx2Ak9+wrlwdw+kEmjZBvzDAii5YWlpDX4jwV3LyPc+wA3SnA/KywA6nG+gECC 2jxttrUcRTEv4QtAsw9KbSLsQfPCrPMYP89MxEtX84/OQim8BaIdIxJDgXK3xRmsFmdu KetZ/eIQ+08LC41R5gAYbyY90Bso+tnBepziAfl5gnqxX5D11NQ3ME9cVfeYpPdPD3BS i2vjHt1lriudMOyHn2KlLrWOTiyzRcSJA7Jm60KtAuUdJTkJkkRIm3nzFmouNGBcIeBy fTvDgurqK9DzT3MPcT/LtQmM08fV8Mak1X3L//Qx4Gs8yilweyNa9LkrN+IzJvSGk4nD 7WDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763359515; x=1763964315; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pJIA99Ovhr5E9/GPOmcHIVHFt9ABVADqpCfcAcpZe5I=; b=HxGNak2VkpJCX37jmwHLtmQWDqcZDg5JtpThUNYCYc2ultS/DcweLAJHJYpjBHBcEb w5binTE6yNG4eBSa/9alAA33HhVWGyzVdA9yNg30u1/2LsIKVb9soDJ9lP+CoBdHrxsc YelqKYd3pHz02scon+GYKbg0vs0ifF5wkXPCc6qAa8HExsiqL0GTL5sstQdbFcbkd+9w T89iowA4pN2FnDUgTTeYxo97nX5QWdgEckQjm0r6Uyll2LKhde66kF7zKv3ndNaOu7iC n9f0dD0N2JQrrtitSbTJuEO8UfWrmvTO5eS1sgTtX5hpvrgDCmlnibK/4LXI1TOW4uXR 0EYw== X-Forwarded-Encrypted: i=1; AJvYcCW+ka1oDxHuC4qDajFi9lsEv/8gpkeBMfUE33bIUoWXIANv862hT55DwuVfw7BwAjKNd+efLbAngN25LXjHOPLsSQFR@freebsd.org X-Gm-Message-State: AOJu0YxuzNbw+TeiN8daGDeOlFbDcxTclAsFd7RPGjetNvKwRhzbF1w+ T/B0r0SAzNDIX2I3TTq6MjXx7L+tm/yYPW2wF3g4WCjZnA790Fa01ykLeIDeka5++phAC0X7/q5 er4UiGyEc/EC0x8wkwAmE/48qFa/dGNsFIwuDEzqR1Q== X-Gm-Gg: ASbGncsEvInJOUgGjyOyZWz/E4aQ7TAbcDq7HC1ozt8MiVBGI6d1r7CEC+tZQZBTi+7 iQ6IJI6Xd7efaVzPDDHNEoRvh7/YSBfglDL9n3/KOCGJE+WzfeinK8RYUnPQIpcAAH8cjHcUh/C m4SzHzAc/TGyRuYQcnr5MyKCL/1JmzyUOrMOUhCPyoqx+Ys6F2LYNBIOF1pa2kmn5A7RiRNKWme Ze5ZeM3EiopjTR7+qPtw0D8Vo59anw+w/9TTEmhK4Dv4NoXOM6eIqEKuODAsHlxy5I3q3g= X-Google-Smtp-Source: AGHT+IGh9wjHLq2azusccrw0tb/hnW9GkG+4B/ikojqXaobzAOh0kL0TiXo2q7BLMEOScsoTdnNkyIq0zJnYAF7YPys= X-Received: by 2002:a17:90b:3d92:b0:33b:6650:57c3 with SMTP id 98e67ed59e1d1-343fa63269amr11423544a91.21.1763359515156; Sun, 16 Nov 2025 22:05:15 -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: <202511170018.5AH0ITWK063891@gitrepo.freebsd.org> <20251117051144.3d0c31d9@thor.sb211.local> In-Reply-To: From: Warner Losh Date: Sun, 16 Nov 2025 23:05:08 -0700 X-Gm-Features: AWmQ_bk5Kwd3fM75I4wSPxP1kx1E8K4PVuD4YCtiupn8XKsZeWHPWLtFWCRnfsY Message-ID: Subject: Re: git: 44fb9f2701c7 - main - sys/efi_map.h: This is a kernel-only file To: A FreeBSD User Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000083325b0643c4218e" X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1030:from]; R_SPF_NA(0.00)[no SPF record]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; MISSING_XM_UA(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4d8xzx1wzwz3SF7 --00000000000083325b0643c4218e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Nov 16, 2025 at 10:16=E2=80=AFPM Warner Losh wrote= : > > > On Sun, Nov 16, 2025 at 9:14=E2=80=AFPM A FreeBSD User > wrote: > >> Am Tage des Herren Mon, 17 Nov 2025 00:18:29 GMT >> Warner Losh schrieb: >> >> > The branch main has been updated by imp: >> > >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc6b7e= 735ecd5868 >> > >> > commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868 >> > Author: Warner Losh >> > AuthorDate: 2025-11-16 23:58:37 +0000 >> > Commit: Warner Losh >> > CommitDate: 2025-11-17 00:16:26 +0000 >> > >> > sys/efi_map.h: This is a kernel-only file >> > >> > Slap a #ifdef _KERNEL around it all since it's useless to userland= . >> > >> > Fixes: 43b8edb32051 >> > Sponsored by: Netflix >> > --- >> > sys/sys/efi_map.h | 4 ++++ >> > 1 file changed, 4 insertions(+) >> > >> > diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h >> > index 8b458cd08b00..d2206056b1f8 100644 >> > --- a/sys/sys/efi_map.h >> > +++ b/sys/sys/efi_map.h >> > @@ -7,6 +7,8 @@ >> > #ifndef _SYS_EFI_MAP_H_ >> > #define _SYS_EFI_MAP_H_ >> > >> > +#ifdef _KERNEL >> > + >> > #include >> > #include >> > >> > @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header >> *efihdr); >> > void efi_map_exclude_entries(struct efi_map_header *efihdr); >> > void efi_map_print_entries(struct efi_map_header *efihdr); >> > >> > +#endif >> > + >> > #endif /* !_SYS_EFI_MAP_H_ */ >> > >> >> Hello, >> >> tried a buildworld just now and it fails, something seems missing: >> >> [...] >> =3D=3D=3D> stand/libsa (all) >> mkdir -p xlocale arpa ssp; for i in a.out.h assert.h elf.h limits.h >> nlist.h setjmp.h stddef.h >> stdbool.h string.h strings.h time.h uuid.h; do ln -sf >> /usr/src/include/$i $i; done; ln -sf >> /usr/src/sys/sys/errno.h errno.h; ln -sf /usr/src/sys/sys/stdarg.h >> stdarg.h; ln -sf >> /usr/src/sys/sys/stdint.h stdint.h; ln -sf /usr/src/include/arpa/inet.h >> arpa/inet.h; ln -sf >> /usr/src/include/arpa/tftp.h arpa/tftp.h; ln -sf >> /usr/src/include/ssp/ssp.h ssp/ssp.h; for i in _time.h _strings.h >> _string.h; do [ -f xlocale/$i ] || :> >> xlocale/$i; done; for i in ctype.h fcntl.h signal.h stdio.h stdlib.h >> unistd.h; do ln -sf >> /usr/src/stand/libsa/stand.h $i; done cc -target >> x86_64-unknown-freebsd16.0 >> --sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp >> -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -O2 >> -pipe -fno-common -nostdinc >> -I/usr/obj/usr/src/amd64.amd64/stand/libsa >> -I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys >> -Ddouble=3Djagged-little-pill >> -Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections >> -DLOADER_GELI_SUPPORT >> -I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-mm= x >> -mno-sse -mno-avx >> -mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. >> -DLOADER_VERIEXEC >> -I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude >> -I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype >> -I/usr/src/contrib/bearssl/src >> -I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO >> -I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM >> -DVE_SHA256_SUPPORT >> -DVE_SHA384_SUPPORT -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT >> -I/usr/src/stand/efi/include >> -I/usr/src/lib/libsecureboot/efi/include >> -I/usr/src/stand/efi/include/amd64 -DNDEBUG -MD >> -MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 >> -Wno-format-zero-length >> -Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body >> -Wno-string-plus-int >> -Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter >> -Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare >> -Wno-unused-value >> -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion >> -Wno-unused-local-typedef >> -Wno-address-of-packed-member -Wno-switch -Wno-switch-enum >> -Wno-knr-promoted-parameter >> -Wno-parentheses -Oz -Qunused-arguments -c >> /usr/src/lib/libsecureboot/efi/efi_variables.c >> -o efi_variables.o In file included from >> /usr/src/lib/libsecureboot/efi/efi_variables.c:31: >> /usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file not >> found 47 | #include >> >> [...] > > > I've done 20 buildworlds today. And on what architecture? What do you hav= e > in your src.conf since I'm not seeing this and I didn't think we built > libsecureboot by default. I certainly didn't fix it and didn't expect it = to > include efi.h from stand. I'm skeptical about why since that file is > tailored to the boot loader only. > > Warner > Oh, I see. WITH_BEARSSL and WITH_LOADER_EFI_SECUREBOOT must have been selected. I just fixed this with 3c5ca68b9b7c. Unless it's something else, in which case I'll need more details. Warner --00000000000083325b0643c4218e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Sun, Nov 16,= 2025 at 10:16=E2=80=AFPM Warner Losh <imp@bsdimp.com> wrote:


On Sun, Nov 16, 2025= at 9:14=E2=80=AFPM A FreeBSD User <freebsd@walstatt-de.de> wrote:
Am Tage des Herren Mon, 17 No= v 2025 00:18:29 GMT
Warner Losh <imp@FreeBSD.org> schrieb:

> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D44fb9f2701c71ce6bba75810fc6b7e735ecd5868<= /a>
>
> commit 44fb9f2701c71ce6bba75810fc6b7e735ecd5868
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2025-11-16 23:58:37 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2025-11-17 00:16:26 +0000
>
>=C2=A0 =C2=A0 =C2=A0sys/efi_map.h: This is a kernel-only file
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Slap a #ifdef _KERNEL around it all since it's = useless to userland.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Fixes:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 43b8edb320= 51
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0Netflix
> ---
>=C2=A0 sys/sys/efi_map.h | 4 ++++
>=C2=A0 1 file changed, 4 insertions(+)
>
> diff --git a/sys/sys/efi_map.h b/sys/sys/efi_map.h
> index 8b458cd08b00..d2206056b1f8 100644
> --- a/sys/sys/efi_map.h
> +++ b/sys/sys/efi_map.h
> @@ -7,6 +7,8 @@
>=C2=A0 #ifndef _SYS_EFI_MAP_H_
>=C2=A0 #define _SYS_EFI_MAP_H_
>=C2=A0
> +#ifdef _KERNEL
> +
>=C2=A0 #include <sys/efi.h>
>=C2=A0 #include <machine/metadata.h>
>=C2=A0
> @@ -21,4 +23,6 @@ void efi_map_add_entries(struct efi_map_header *efih= dr);
>=C2=A0 void efi_map_exclude_entries(struct efi_map_header *efihdr);
>=C2=A0 void efi_map_print_entries(struct efi_map_header *efihdr);
>=C2=A0
> +#endif
> +
>=C2=A0 #endif /* !_SYS_EFI_MAP_H_ */
>

Hello,

tried a buildworld just now and it fails, something seems missing:

[...]
=3D=3D=3D> stand/libsa (all)
mkdir -p xlocale arpa ssp;=C2=A0 for i in a.out.h assert.h elf.h limits.h n= list.h setjmp.h stddef.h
stdbool.h string.h strings.h time.h uuid.h; do=C2=A0 ln -sf /usr/src/includ= e/$i $i;=C2=A0 done;=C2=A0 ln -sf
/usr/src/sys/sys/errno.h errno.h;=C2=A0 ln -sf /usr/src/sys/sys/stdarg.h st= darg.h;=C2=A0 ln -sf
/usr/src/sys/sys/stdint.h stdint.h;=C2=A0 ln -sf /usr/src/include/arpa/inet= .h arpa/inet.h;=C2=A0 ln -sf
/usr/src/include/arpa/tftp.h arpa/tftp.h;=C2=A0 ln -sf /usr/src/include/ssp= /ssp.h ssp/ssp.h;=C2=A0 for i in _time.h _strings.h _string.h; do=C2=A0 [ -= f xlocale/$i ] || :>
xlocale/$i;=C2=A0 done;=C2=A0 for i in ctype.h fcntl.h signal.h stdio.h std= lib.h unistd.h; do=C2=A0 ln -sf
/usr/src/stand/libsa/stand.h $i;=C2=A0 done cc -target x86_64-unknown-freeb= sd16.0
--sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp -B/usr/obj/usr/src/amd64.amd64= /tmp/usr/bin=C2=A0 -O2
-pipe -fno-common=C2=A0 =C2=A0-nostdinc=C2=A0 =C2=A0 -I/usr/obj/usr/src/amd= 64.amd64/stand/libsa
-I/usr/src/stand/libsa -D_STANDALONE -I/usr/src/sys -Ddouble=3Djagged-littl= e-pill
-Dfloat=3Dfloaty-mcfloatface -ffunction-sections -fdata-sections -DLOADER_G= ELI_SUPPORT
-I/usr/src/stand/libsa/geli -DLOADER_DISK_SUPPORT -ffreestanding -mno-mmx -= mno-sse -mno-avx
-mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. -DLOADER_VERIEXEC=
-I/usr/src/lib/libsecureboot/h -DLOADER_VERIEXEC_VECTX -Iinclude
-I/usr/src/contrib/bearssl/inc -Wno-deprecated-non-prototype -I/usr/src/con= trib/bearssl/src
-I/usr/src/lib/libsecureboot/h -DHAVE_BR_X509_TIME_CHECK -DNO_STDIO
-I/usr/src/contrib/bearssl/tools -I. -DTRUST_ANCHOR_STR=3Dta_PEM -DVE_SHA25= 6_SUPPORT
-DVE_SHA384_SUPPORT=C2=A0 -DVE_RSA_SUPPORT -DVE_PCR_SUPPORT -I/usr/src/stan= d/efi/include
-I/usr/src/lib/libsecureboot/efi/include=C2=A0 -I/usr/src/stand/efi/include= /amd64 -DNDEBUG -MD
-MF.depend.efi_variables.o -MTefi_variables.o -std=3Dgnu17 -Wno-format-zero= -length
-Wsystem-headers -Wno-pointer-sign -Wdate-time -Wno-empty-body -Wno-string-= plus-int
-Wno-unused-const-variable -Wno-error=3Dunused-but-set-parameter
-Wno-error=3Dcast-function-type-mismatch -Wno-tautological-compare -Wno-unu= sed-value
-Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-un= used-local-typedef
-Wno-address-of-packed-member -Wno-switch -Wno-switch-enum -Wno-knr-promote= d-parameter
-Wno-parentheses=C2=A0 -Oz -Qunused-arguments=C2=A0 =C2=A0 =C2=A0-c /usr/sr= c/lib/libsecureboot/efi/efi_variables.c
-o efi_variables.o In file included from /usr/src/lib/libsecureboot/efi/efi= _variables.c:31:
/usr/src/stand/efi/include/efi.h:47:10: fatal error: 'Uefi.h' file = not found 47 | #include
<Uefi.h>
[...]




--00000000000083325b0643c4218e--