From 9f2f949c9874b7a38e43fa98c242a85e86519bdd Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 21 Oct 2019 17:45:00 +0000 Subject: [PATCH] MFC r339524 (by imp): Add missing options. WITHOUT_LOADER_LUA is only needed since we turned it off by default on powerpc and sparc64 in r338203. Same with WITHOUT_LOADER_GEIL. WITH_NVME, WITHOUT_NVME, WITH_LOADER_FORCE_LE have been needed since they were added. MFC r353737: Provide a src.conf(5) description for the new WITHOUT_CAROOT option, and rename the WITH_LOADER_VERIEXEC_PASS_MANFIEST description to its correct name. Also correct a bunch of spelling errors in that description. --- share/man/man5/src.conf.5 | 44 ++++++++++++++++--- tools/build/options/WITHOUT_LOADER_LUA | 2 + tools/build/options/WITHOUT_NVME | 2 + tools/build/options/WITH_LOADER_FORCE_LE | 3 ++ tools/build/options/WITH_LOADER_GELI | 2 + tools/build/options/WITH_LOADER_VERIEXEC | 6 +-- .../WITH_LOADER_VERIEXEC_PASS_MANFIEST | 8 ---- .../WITH_LOADER_VERIEXEC_PASS_MANIFEST | 8 ++++ tools/build/options/WITH_NVME | 3 ++ tools/build/options/WITH_VERIEXEC | 4 +- 10 files changed, 63 insertions(+), 19 deletions(-) create mode 100644 tools/build/options/WITHOUT_LOADER_LUA create mode 100644 tools/build/options/WITHOUT_NVME create mode 100644 tools/build/options/WITH_LOADER_FORCE_LE create mode 100644 tools/build/options/WITH_LOADER_GELI delete mode 100644 tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANFIEST create mode 100644 tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST create mode 100644 tools/build/options/WITH_NVME diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 3f75854c4e1..e86691f1d1e 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd September 26, 2019 +.Dd October 21, 2019 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1252,11 +1252,24 @@ with support for verification based on certificates obtained from UEFI. .It Va WITH_LOADER_FIREWIRE Enable firewire support in /boot/loader on x86. This option is a nop on all other platforms. +.It Va WITH_LOADER_FORCE_LE +Set to force the powerpc boot loader to launch the kernel in little +endian mode. .It Va WITHOUT_LOADER_GELI Disable inclusion of GELI crypto support in the boot chain binaries. .Pp This is a default setting on powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. +.It Va WITH_LOADER_GELI +Set to build GELI bootloader support. +.Pp +This is a default setting on +amd64/amd64, arm/arm, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf and riscv/riscv64. +.It Va WITHOUT_LOADER_LUA +Set to not build LUA bindings for the boot loader. +.Pp +This is a default setting on +powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64. .It Va WITH_LOADER_LUA Set to build LUA bindings for the boot loader. .Pp @@ -1285,10 +1298,10 @@ arm/arm, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips6 .It Va WITH_LOADER_VERIEXEC Enable building .Xr loader 8 -with support for verifcation similar to Verified Exec. +with support for verification similar to Verified Exec. .Pp -It depends on -.Va WITH_BEARSSL +Depends on +.Va WITH_BEARSSL . When set, these options are also in effect: .Pp .Bl -inset -compact @@ -1297,6 +1310,14 @@ When set, these options are also in effect: .Va WITHOUT_LOADER_EFI_SECUREBOOT is set explicitly) .El +.It Va WITH_LOADER_VERIEXEC_PASS_MANIFEST +Enable building +.Xr loader 8 +with support to pass a verified manifest to the kernel. +The kernel has to be built with a module to parse the manifest. +.Pp +Depends on +.Va WITH_LOADER_VERIEXEC . .It Va WITHOUT_LOADER_ZFS Set to not build ZFS file system boot loader support. .It Va WITHOUT_LOCALES @@ -1502,6 +1523,17 @@ will not be built either if this option is set. Set to not build .Xr ntpd 8 and related programs. +.It Va WITHOUT_NVME +Set to not build nvme related tools and kernel modules. +.Pp +This is a default setting on +arm/arm, arm/armv6, arm/armv7, arm64/aarch64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpcspe, riscv/riscv64 and sparc64/sparc64. +.It Va WITH_NVME +Set to build nvme related tools and kernel modules. + +.Pp +This is a default setting on +amd64/amd64, i386/i386 and powerpc/powerpc64. .It Va WITH_OFED Set to build the .Dq "OpenFabrics Enterprise Distribution" @@ -1919,8 +1951,8 @@ which loads the contents of verified manifests into the kernel for use by .Xr mac_veriexec 4 .Pp -It depends on -.Va WITH_BEARSSL +Depends on +.Va WITH_BEARSSL . .It Va WITHOUT_VI Set to not build and install vi, view, ex and related programs. .It Va WITHOUT_VT diff --git a/tools/build/options/WITHOUT_LOADER_LUA b/tools/build/options/WITHOUT_LOADER_LUA new file mode 100644 index 00000000000..99a9cf2eb39 --- /dev/null +++ b/tools/build/options/WITHOUT_LOADER_LUA @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build LUA bindings for the boot loader. diff --git a/tools/build/options/WITHOUT_NVME b/tools/build/options/WITHOUT_NVME new file mode 100644 index 00000000000..be0a452b657 --- /dev/null +++ b/tools/build/options/WITHOUT_NVME @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build nvme related tools and kernel modules. diff --git a/tools/build/options/WITH_LOADER_FORCE_LE b/tools/build/options/WITH_LOADER_FORCE_LE new file mode 100644 index 00000000000..ff8bb19ba9a --- /dev/null +++ b/tools/build/options/WITH_LOADER_FORCE_LE @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to force the powerpc boot loader to launch the kernel in little +endian mode. diff --git a/tools/build/options/WITH_LOADER_GELI b/tools/build/options/WITH_LOADER_GELI new file mode 100644 index 00000000000..60cb732c783 --- /dev/null +++ b/tools/build/options/WITH_LOADER_GELI @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to build GELI bootloader support. diff --git a/tools/build/options/WITH_LOADER_VERIEXEC b/tools/build/options/WITH_LOADER_VERIEXEC index 72dbbb12fd4..e4473207552 100644 --- a/tools/build/options/WITH_LOADER_VERIEXEC +++ b/tools/build/options/WITH_LOADER_VERIEXEC @@ -1,7 +1,7 @@ .\" $FreeBSD$ Enable building .Xr loader 8 -with support for verifcation similar to Verified Exec. +with support for verification similar to Verified Exec. .Pp -It depends on -.Va WITH_BEARSSL +Depends on +.Va WITH_BEARSSL . diff --git a/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANFIEST b/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANFIEST deleted file mode 100644 index 185955ee290..00000000000 --- a/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANFIEST +++ /dev/null @@ -1,8 +0,0 @@ -.\" $FreeBSD$ -Enable building -.Xr loader 8 -with support to pass a verified manifest to kernel. -Kernel has to be build with a module to parse the manfiest. -.Pp -It depends on -.Va WITH_LOADER_VERIEXEC diff --git a/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST b/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST new file mode 100644 index 00000000000..32dd8525e82 --- /dev/null +++ b/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST @@ -0,0 +1,8 @@ +.\" $FreeBSD$ +Enable building +.Xr loader 8 +with support to pass a verified manifest to the kernel. +The kernel has to be built with a module to parse the manifest. +.Pp +Depends on +.Va WITH_LOADER_VERIEXEC . diff --git a/tools/build/options/WITH_NVME b/tools/build/options/WITH_NVME new file mode 100644 index 00000000000..6ba792562f6 --- /dev/null +++ b/tools/build/options/WITH_NVME @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to build nvme related tools and kernel modules. + diff --git a/tools/build/options/WITH_VERIEXEC b/tools/build/options/WITH_VERIEXEC index e46fab7addf..579209bcd17 100644 --- a/tools/build/options/WITH_VERIEXEC +++ b/tools/build/options/WITH_VERIEXEC @@ -5,5 +5,5 @@ which loads the contents of verified manifests into the kernel for use by .Xr mac_veriexec 4 .Pp -It depends on -.Va WITH_BEARSSL +Depends on +.Va WITH_BEARSSL . -- 2.45.0