From nobody Mon Nov 17 05:16:58 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 4d8wwS1zjKz6GYvQ for ; Mon, 17 Nov 2025 05:17:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) (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 4d8wwR62Lyz3LFj for ; Mon, 17 Nov 2025 05:17:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-794e300e20dso3347765b3a.1 for ; Sun, 16 Nov 2025 21:17:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1763356626; x=1763961426; 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=e8XlpNfcvyUx/Se6pwt3ZWbWjuf5pHG0+mobceRFvUM=; b=gq7B+csLu5G2wnwS6nmhvpLL6bDzZf6+fVHOOm8B1VgG+AMpa6c0Sgji3ZpGNcpMZH XpydjYW5e33eKLQZvNAHpHT/oMk7GpgRbKOSGKexqO2PVtKOqZV3uwJC+zUKHhXr5UCL r1ZyWYvCJMExu9Ok0PNqGjbuGbWo3csHGfzcWPrfg/2KXiddyUvzF6KKEHmRlxOnjnc8 bOmTU6A6dtY7LfdEjI1X396tlYHIxFUL5G+zIXBSWNqyecujQCesdg5TOZrOwDKMF1kl MBP1M4eSSyo9MqWiYFSwQ6gF4mfUsQyrjq5nLvdE8STmGeNzmD1WpXSHDlypyRE/BLEI kyCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763356626; x=1763961426; 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=e8XlpNfcvyUx/Se6pwt3ZWbWjuf5pHG0+mobceRFvUM=; b=iHZx/97YX3nJbPNn3q6AQ+599H2UTk4jQCNBikJMUJo77AggqicG/Ttmpvf3huUygq 2JyBDOIc7ifpEQvDodnkzCVHL+f1rV3zO3VCSpfA4UlmI1+Xbgul2ht+EwKyWM1xfQxJ NWVb2QMjk/giwVI/otQMVgzfOwYuuT5O+SXhhEklkawNPy1y7aO7k9MiPEIrJy7w9od0 4gYV079Kay4v8hmOID1c1PQt8/3VBa8PrY6OjCXrtOPtBbhScHTqcKR5prcdNn9/hKQF 7S9iXSWW+Y4v9ARSIdKexxPEuxvh+47LF0dK4W/deEd4juNG82HdCnSQU2FYbPIu/jKm Vg3A== X-Forwarded-Encrypted: i=1; AJvYcCWok4JeprXkTVcCYgH9sLTGSSuU+ePykKhQkmVxQMSj0HdZrP++3Jngj5iZecYBXI9zp+5DvINEndLYqM2p0h1n/qgP@freebsd.org X-Gm-Message-State: AOJu0YzG+MUEBwIXE8lKJxXqoJdHFsctaKbPWzOjY6sb+7AA9ABGiWmo C1YZFxpw4V5Xxbbit2t6whA1d6SFpTnO0BO9fmHWMtSA0YWk8z98q6syXnX4IogoCK/3eq4tr9a OawDRKNR9813087BqcGLb1A2byrOifBXOzueWCp1rtOgh3LzTQtUZNKA= X-Gm-Gg: ASbGncspjUAVkADsFnGXod21Cs5Oj9JSTzaIHcB9NH+L18mc+vIzgy9VMoYpPzbIxmY 9hCzw0T92MRWCYI1rSVL30yeW5doVTHqHJj9cukyMKgpxJ8zJrd5z9VrSgqEiWKizGqTFR668TD OcIgq109zfjKVisbUA6D+b512cNFBt+faxptcKk7znq1IYbfMRFlj4Fy1uhhb716avljU/13YpP vAMTVEDS/VU8gWTBSElBnenDsfsBYCGzcSnj5ju5winfCVP3zl7nZ+jw+wyc4Azs8XJE0g= X-Google-Smtp-Source: AGHT+IHZy7Ink/+tyGMYMvE1hsgBYhm5rL8LcKoxyqmf7N8odaawOeqUrFAyIuecDlshXZB8er5zxjjBKI/8Qa5HVUw= X-Received: by 2002:a17:90b:4c44:b0:343:3898:e7c9 with SMTP id 98e67ed59e1d1-343eab041a1mr15470263a91.2.1763356625158; Sun, 16 Nov 2025 21:17:05 -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: <20251117051144.3d0c31d9@thor.sb211.local> From: Warner Losh Date: Sun, 16 Nov 2025 22:16:58 -0700 X-Gm-Features: AWmQ_bk-bD48vVwLeHLfAxCfjqPPNVcYUHfgM1bN0BRahjWnIohHjZvXFW4fC44 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="00000000000041538b0643c3753e" X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4d8wwR62Lyz3LFj --00000000000041538b0643c3753e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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=3D44fb9f2701c71ce6bba75810fc6b7e7= 35ecd5868 > > > > 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/lib= sa > -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-mmx > -mno-sse -mno-avx > -mno-avx2 -msoft-float -fPIC -mno-red-zone -mno-relax -I. -DLOADER_VERIEX= EC > -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 have 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 --00000000000041538b0643c3753e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


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 Nov 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>
[...]


--00000000000041538b0643c3753e--