From owner-svn-src-all@freebsd.org  Thu May 26 23:20:03 2016
Return-Path: <owner-svn-src-all@freebsd.org>
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 92FCEB480CA;
 Thu, 26 May 2016 23:20:03 +0000 (UTC)
 (envelope-from bdrewery@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 A6BB71189;
 Thu, 26 May 2016 23:20:02 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4QNK17g069880;
 Thu, 26 May 2016 23:20:01 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4QNK1ck069877;
 Thu, 26 May 2016 23:20:01 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201605262320.u4QNK1ck069877@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 26 May 2016 23:20:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300795 - in head: . sys/conf targets/pseudo/kernel
X-SVN-Group: head
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.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 May 2016 23:20:03 -0000

Author: bdrewery
Date: Thu May 26 23:20:01 2016
New Revision: 300795
URL: https://svnweb.freebsd.org/changeset/base/300795

Log:
  WITH_META_MODE: Move the kernel support to kern.pre.mk.
  
  This allows using META_MODE directly from the kernel build directory.
  This also allows removing a hack from the DIRDEPS_BUILD kernel target.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1
  head/sys/conf/kern.pre.mk
  head/targets/pseudo/kernel/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu May 26 23:19:57 2016	(r300794)
+++ head/Makefile.inc1	Thu May 26 23:20:01 2016	(r300795)
@@ -591,11 +591,6 @@ IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLA
 # kernel stage
 KMAKEENV=	${WMAKEENV}
 KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
-.if ${MK_META_MODE} == "yes"
-# meta mode normally is disallowed when building from curdir==objdir, but we
-# want to allow it for the kernel build.
-KMAKEENV+=	META_MODE="${.MAKE.MODE} curdirOk=yes"
-.endif
 
 #
 # buildworld

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu May 26 23:19:57 2016	(r300794)
+++ head/sys/conf/kern.pre.mk	Thu May 26 23:20:01 2016	(r300795)
@@ -19,6 +19,11 @@ _srcconf_included_:
 .include <bsd.compiler.mk>
 .include "kern.opts.mk"
 
+# The kernel build always occurs in the object directory which is .CURDIR.
+.if ${.MAKE.MODE:Unormal:Mmeta}
+.MAKE.MODE+=	curdirOk=yes
+.endif
+
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
 KERNEL?=	kernel

Modified: head/targets/pseudo/kernel/Makefile
==============================================================================
--- head/targets/pseudo/kernel/Makefile	Thu May 26 23:19:57 2016	(r300794)
+++ head/targets/pseudo/kernel/Makefile	Thu May 26 23:20:01 2016	(r300795)
@@ -15,10 +15,8 @@ ${KERNCONF}.config: .MAKE ${META_DEPS}
 	(cd ${KERN_CONFDIR} && \
 	${CONFIG} ${CONFIGARGS} -d ${KERN_OBJDIR} ${KERNCONF})
 
-# we need to pass curdirOk=yes to meta mode, since we want .meta files
-# in ${KERN_OBJDIR}
 ${KERNCONF}.build: .MAKE ${KERNCONF}.config
-	(cd ${KERN_OBJDIR} && META_MODE="${.MAKE.MODE} curdirOk=yes" ${.MAKE})
+	(cd ${KERN_OBJDIR} && ${.MAKE})
 
 .if ${.MAKE.LEVEL} > 0
 all: ${KERNCONF}.build