svn commit: r325484 - in head/sys/boot: . efi geli i386 man uboot
Warner Losh
imp at FreeBSD.org
Mon Nov 6 15:22:19 UTC 2017
Author: imp
Date: Mon Nov 6 15:22:17 2017
New Revision: 325484
URL: https://svnweb.freebsd.org/changeset/base/325484
Log:
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
Modified:
head/sys/boot/Makefile.inc
head/sys/boot/efi/Makefile
head/sys/boot/geli/Makefile
head/sys/boot/i386/Makefile
head/sys/boot/man/Makefile
head/sys/boot/uboot/Makefile
Modified: head/sys/boot/Makefile.inc
==============================================================================
--- head/sys/boot/Makefile.inc Mon Nov 6 15:22:11 2017 (r325483)
+++ head/sys/boot/Makefile.inc Mon Nov 6 15:22:17 2017 (r325484)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <src.opts.mk>
-
.include "defs.mk"
.if !defined(__BOOT_MAKEFILE_INC__)
Modified: head/sys/boot/efi/Makefile
==============================================================================
--- head/sys/boot/efi/Makefile Mon Nov 6 15:22:11 2017 (r325483)
+++ head/sys/boot/efi/Makefile Mon Nov 6 15:22:17 2017 (r325484)
@@ -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.
Modified: head/sys/boot/geli/Makefile
==============================================================================
--- head/sys/boot/geli/Makefile Mon Nov 6 15:22:11 2017 (r325483)
+++ head/sys/boot/geli/Makefile Mon Nov 6 15:22:17 2017 (r325484)
@@ -3,9 +3,8 @@
MAN=
-.include <src.opts.mk>
-MK_SSP= no
.include <bsd.init.mk>
+MK_SSP= no
LIB= geliboot
INTERNALLIB=
Modified: head/sys/boot/i386/Makefile
==============================================================================
--- head/sys/boot/i386/Makefile Mon Nov 6 15:22:11 2017 (r325483)
+++ head/sys/boot/i386/Makefile Mon Nov 6 15:22:17 2017 (r325484)
@@ -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
Modified: head/sys/boot/man/Makefile
==============================================================================
--- head/sys/boot/man/Makefile Mon Nov 6 15:22:11 2017 (r325483)
+++ head/sys/boot/man/Makefile Mon Nov 6 15:22:17 2017 (r325484)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
MAN+= loader.8
.if ${MK_ZFS} != "no"
Modified: head/sys/boot/uboot/Makefile
==============================================================================
--- head/sys/boot/uboot/Makefile Mon Nov 6 15:22:11 2017 (r325483)
+++ head/sys/boot/uboot/Makefile Mon Nov 6 15:22:17 2017 (r325484)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
SUBDIR= lib
More information about the svn-src-all
mailing list