From 9b19f65c83aa290548baeef1f60ff011bd54f28f Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 6 Nov 2017 15:22:17 +0000
Subject: [PATCH] Prefer bsd.init.mk to src.opts.mk

Final sweep to prefer bsd.init.mk to src.opts.mk everywhere as a
design pattern.  The rule is that all Makefiles in this subtree should
start with .include <bsd.init.mk> so that we properly include
../Makefile.inc and defs.mk before anything else.

Sponsored by: Netflix
---
 sys/boot/Makefile.inc   | 2 --
 sys/boot/efi/Makefile   | 2 +-
 sys/boot/geli/Makefile  | 3 +--
 sys/boot/i386/Makefile  | 2 +-
 sys/boot/man/Makefile   | 2 +-
 sys/boot/uboot/Makefile | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
index b83216982df..cf833d92423 100644
--- a/sys/boot/Makefile.inc
+++ b/sys/boot/Makefile.inc
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .include "defs.mk"
 
 .if !defined(__BOOT_MAKEFILE_INC__)
diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile
index 66481f8513f..e3b22de4a99 100644
--- a/sys/boot/efi/Makefile
+++ b/sys/boot/efi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
 # than 4.5 supports it.
diff --git a/sys/boot/geli/Makefile b/sys/boot/geli/Makefile
index cf16c411503..84ac9bdf669 100644
--- a/sys/boot/geli/Makefile
+++ b/sys/boot/geli/Makefile
@@ -3,9 +3,8 @@
 
 MAN=
 
-.include <src.opts.mk>
-MK_SSP=		no
 .include <bsd.init.mk>
+MK_SSP=		no
 
 LIB=		geliboot
 INTERNALLIB=
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 0c3daed185e..af74d6954da 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
 		libi386 libfirewire loader
diff --git a/sys/boot/man/Makefile b/sys/boot/man/Makefile
index fcca328b500..15285acbafc 100644
--- a/sys/boot/man/Makefile
+++ b/sys/boot/man/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 MAN+=	loader.8
 .if ${MK_ZFS} != "no"
diff --git a/sys/boot/uboot/Makefile b/sys/boot/uboot/Makefile
index 43b57480fe4..8c3a80dd6e2 100644
--- a/sys/boot/uboot/Makefile
+++ b/sys/boot/uboot/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 SUBDIR=	lib