From owner-svn-src-all@freebsd.org Mon Nov 6 15:22:19 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 352C4E60A3D; Mon, 6 Nov 2017 15:22:19 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE26D73260; Mon, 6 Nov 2017 15:22:18 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA6FMIWO036573; Mon, 6 Nov 2017 15:22:18 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA6FMH59036567; Mon, 6 Nov 2017 15:22:17 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711061522.vA6FMH59036567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 6 Nov 2017 15:22:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325484 - in head/sys/boot: . efi geli i386 man uboot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: . efi geli i386 man uboot X-SVN-Commit-Revision: 325484 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Nov 2017 15:22:19 -0000 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 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 - .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 +.include # 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 -MK_SSP= no .include +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 +.include 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 +.include 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 +.include SUBDIR= lib