Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Oct 2019 17:45:00 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r353800 - in stable/12: share/man/man5 tools/build/options
Message-ID:  <201910211745.x9LHj031051652@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Mon Oct 21 17:45:00 2019
New Revision: 353800
URL: https://svnweb.freebsd.org/changeset/base/353800

Log:
  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.

Added:
  stable/12/tools/build/options/WITHOUT_LOADER_LUA
     - copied unchanged from r339524, head/tools/build/options/WITHOUT_LOADER_LUA
  stable/12/tools/build/options/WITHOUT_NVME
     - copied unchanged from r339524, head/tools/build/options/WITHOUT_NVME
  stable/12/tools/build/options/WITH_LOADER_FORCE_LE
     - copied unchanged from r339524, head/tools/build/options/WITH_LOADER_FORCE_LE
  stable/12/tools/build/options/WITH_LOADER_GELI
     - copied unchanged from r339524, head/tools/build/options/WITH_LOADER_GELI
  stable/12/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST
     - copied unchanged from r353737, head/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST
  stable/12/tools/build/options/WITH_NVME
     - copied unchanged from r339524, head/tools/build/options/WITH_NVME
Deleted:
  stable/12/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANFIEST
Modified:
  stable/12/share/man/man5/src.conf.5
  stable/12/tools/build/options/WITH_LOADER_VERIEXEC
  stable/12/tools/build/options/WITH_VERIEXEC
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/man/man5/src.conf.5
==============================================================================
--- stable/12/share/man/man5/src.conf.5	Mon Oct 21 17:17:21 2019	(r353799)
+++ stable/12/share/man/man5/src.conf.5	Mon Oct 21 17:45:00 2019	(r353800)
@@ -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 ob
 .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,
 .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 th
 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

Copied: stable/12/tools/build/options/WITHOUT_LOADER_LUA (from r339524, head/tools/build/options/WITHOUT_LOADER_LUA)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/tools/build/options/WITHOUT_LOADER_LUA	Mon Oct 21 17:45:00 2019	(r353800, copy of r339524, head/tools/build/options/WITHOUT_LOADER_LUA)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build LUA bindings for the boot loader.

Copied: stable/12/tools/build/options/WITHOUT_NVME (from r339524, head/tools/build/options/WITHOUT_NVME)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/tools/build/options/WITHOUT_NVME	Mon Oct 21 17:45:00 2019	(r353800, copy of r339524, head/tools/build/options/WITHOUT_NVME)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build nvme related tools and kernel modules.

Copied: stable/12/tools/build/options/WITH_LOADER_FORCE_LE (from r339524, head/tools/build/options/WITH_LOADER_FORCE_LE)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/tools/build/options/WITH_LOADER_FORCE_LE	Mon Oct 21 17:45:00 2019	(r353800, copy of r339524, head/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.

Copied: stable/12/tools/build/options/WITH_LOADER_GELI (from r339524, head/tools/build/options/WITH_LOADER_GELI)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/tools/build/options/WITH_LOADER_GELI	Mon Oct 21 17:45:00 2019	(r353800, copy of r339524, head/tools/build/options/WITH_LOADER_GELI)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build GELI bootloader support.

Modified: stable/12/tools/build/options/WITH_LOADER_VERIEXEC
==============================================================================
--- stable/12/tools/build/options/WITH_LOADER_VERIEXEC	Mon Oct 21 17:17:21 2019	(r353799)
+++ stable/12/tools/build/options/WITH_LOADER_VERIEXEC	Mon Oct 21 17:45:00 2019	(r353800)
@@ -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 .

Copied: stable/12/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST (from r353737, head/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/tools/build/options/WITH_LOADER_VERIEXEC_PASS_MANIFEST	Mon Oct 21 17:45:00 2019	(r353800, copy of r353737, head/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 .

Copied: stable/12/tools/build/options/WITH_NVME (from r339524, head/tools/build/options/WITH_NVME)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/tools/build/options/WITH_NVME	Mon Oct 21 17:45:00 2019	(r353800, copy of r339524, head/tools/build/options/WITH_NVME)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to build nvme related tools and kernel modules.
+

Modified: stable/12/tools/build/options/WITH_VERIEXEC
==============================================================================
--- stable/12/tools/build/options/WITH_VERIEXEC	Mon Oct 21 17:17:21 2019	(r353799)
+++ stable/12/tools/build/options/WITH_VERIEXEC	Mon Oct 21 17:45:00 2019	(r353800)
@@ -5,5 +5,5 @@ which loads the contents of verified manifests into th
 for use by
 .Xr mac_veriexec 4
 .Pp
-It depends on
-.Va WITH_BEARSSL
+Depends on
+.Va WITH_BEARSSL .



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910211745.x9LHj031051652>