svn commit: r339223 - in head/sys: amd64/conf arm64/conf i386/conf

[Michael Tuexen]

Author: tuexen
Date: Sun Oct  7 15:54:13 2018
New Revision: 339223
URL: https://svnweb.freebsd.org/changeset/base/339223

Log:
  Address the warning regarding duplicate option 'GEOM_PART_GPT' when
  configuring kernels for i386, amd64, and arm64.
  The 'GEOM_PART_GPT' option was added to the DEFAULTS configuration
  in r337967.
  
  Approved by:		re (kib@)
  Reviewed by:		ler@
  Differential Revision:	https://reviews.freebsd.org/D17458
  Sponsored by:		Netflix, Inc.

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/amd64/conf/GENERIC-MMCCAM
  head/sys/arm64/conf/GENERIC
  head/sys/i386/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC	Sun Oct  7 15:28:50 2018	(r339222)
+++ head/sys/amd64/conf/GENERIC	Sun Oct  7 15:54:13 2018	(r339223)
@@ -52,7 +52,6 @@ options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	EFIRT			# EFI Runtime Services support

Modified: head/sys/amd64/conf/GENERIC-MMCCAM
==============================================================================
--- head/sys/amd64/conf/GENERIC-MMCCAM	Sun Oct  7 15:28:50 2018	(r339222)
+++ head/sys/amd64/conf/GENERIC-MMCCAM	Sun Oct  7 15:54:13 2018	(r339223)
@@ -7,7 +7,6 @@ include         MINIMAL
 ident		GENERIC-MMCCAM
 
 # Access GPT-formatted and labeled root volume
-options         GEOM_PART_GPT
 options         GEOM_LABEL
 
 # UART -- for bhyve console

Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC	Sun Oct  7 15:28:50 2018	(r339222)
+++ head/sys/arm64/conf/GENERIC	Sun Oct  7 15:54:13 2018	(r339223)
@@ -50,7 +50,6 @@ options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_FREEBSD32	# Incomplete, but used by cloudabi32.ko.

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Sun Oct  7 15:28:50 2018	(r339222)
+++ head/sys/i386/conf/GENERIC	Sun Oct  7 15:54:13 2018	(r339223)
@@ -51,7 +51,6 @@ options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
-options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4