Page MenuHomeFreeBSD

D58072.1795159181.diff
No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D58072.1795159181.diff

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd May 28, 2026
+.Dd June 27, 2026
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -1075,6 +1075,9 @@
The
.Va LLVM_TARGET_ALL
option should be used rather than this in most cases.
+.It Va WITHOUT_LOADER_BIOS
+Do not build x86 BIOS loader support
+
.It Va WITHOUT_LOADER_BIOS_TEXTONLY
Include graphics, font and video mode support in the i386 and amd64 BIOS
boot loader.
@@ -1156,6 +1159,9 @@
.It Va WITH_LOADER_USB
Build the usb/kshim library
+.It Va WITHOUT_LOADER_USERBOOT
+Do not build x86 userboot loader support
+
.It Va WITH_LOADER_VERBOSE
Build with extra verbose debugging in the loader.
May explode already nearly too large loader over the limit.
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -125,6 +125,7 @@
LLVM_BINUTILS \
LLVM_BINUTILS_BOOTSTRAP \
LLVM_COV \
+ LOADER_BIOS \
LOADER_BIOS_TEXTONLY \
LOADER_GELI \
LOADER_IA32 \
@@ -133,6 +134,7 @@
LOADER_OFW \
LOADER_PXEBOOT \
LOADER_UBOOT \
+ LOADER_USERBOOT \
LOADER_ZFS \
LOCALES \
LOCATE \
diff --git a/stand/Makefile.amd64 b/stand/Makefile.amd64
--- a/stand/Makefile.amd64
+++ b/stand/Makefile.amd64
@@ -1,5 +1,5 @@
-S.yes+= userboot
-S.yes+= i386
+S.${MK_LOADER_USERBOOT}+= userboot
+S.${MK_LOADER_BIOS}+= i386
SUBDIR_DEPEND_userboot+= ${INTERP_DEPENDS}
# These won't get tacked on in an amd64 build
diff --git a/tools/build/options/WITHOUT_LOADER_BIOS b/tools/build/options/WITHOUT_LOADER_BIOS
new file mode 100644
--- /dev/null
+++ b/tools/build/options/WITHOUT_LOADER_BIOS
@@ -0,0 +1,2 @@
+Do not build x86 BIOS loader support
+
diff --git a/tools/build/options/WITHOUT_LOADER_USERBOOT b/tools/build/options/WITHOUT_LOADER_USERBOOT
new file mode 100644
--- /dev/null
+++ b/tools/build/options/WITHOUT_LOADER_USERBOOT
@@ -0,0 +1,2 @@
+Do not build x86 userboot loader support
+
diff --git a/tools/build/options/WITH_LOADER_BIOS b/tools/build/options/WITH_LOADER_BIOS
new file mode 100644
--- /dev/null
+++ b/tools/build/options/WITH_LOADER_BIOS
@@ -0,0 +1,2 @@
+Build x86 BIOS loader support
+
diff --git a/tools/build/options/WITH_LOADER_USERBOOT b/tools/build/options/WITH_LOADER_USERBOOT
new file mode 100644
--- /dev/null
+++ b/tools/build/options/WITH_LOADER_USERBOOT
@@ -0,0 +1,2 @@
+Build x86 userboot loader support
+

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 20, 7:19 AM (3 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41862789
Default Alt Text
D58072.1795159181.diff (2 KB)

Event Timeline