From owner-svn-src-head@freebsd.org  Sat Mar 12 22:21:03 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 ED63AACD824;
 Sat, 12 Mar 2016 22:21: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 BD6CC884;
 Sat, 12 Mar 2016 22:21:03 +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 u2CML2kE035176;
 Sat, 12 Mar 2016 22:21:02 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2CML2L6035174;
 Sat, 12 Mar 2016 22:21:02 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603122221.u2CML2L6035174@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: Sat, 12 Mar 2016 22:21:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296770 - head/sys/conf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Mar 2016 22:21:04 -0000

Author: bdrewery
Date: Sat Mar 12 22:21:02 2016
New Revision: 296770
URL: https://svnweb.freebsd.org/changeset/base/296770

Log:
  Stop looking up these values in every subdir on install.
  
  This was slowing down installkernel since it was rerunning this in
  every module directory.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/conf/config.mk
  head/sys/conf/kern.opts.mk

Modified: head/sys/conf/config.mk
==============================================================================
--- head/sys/conf/config.mk	Sat Mar 12 21:44:33 2016	(r296769)
+++ head/sys/conf/config.mk	Sat Mar 12 22:21:02 2016	(r296770)
@@ -49,6 +49,7 @@ KERN_OPTS+= INET6
 .if ${MK_EISA} != "no"
 KERN_OPTS+= DEV_EISA
 .endif
-.else
+.elif !defined(KERN_OPTS)
 KERN_OPTS!=cat ${KERNBUILDDIR}/opt*.h | awk '{print $$2;}' | sort -u
+.export KERN_OPTS
 .endif

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk	Sat Mar 12 21:44:33 2016	(r296769)
+++ head/sys/conf/kern.opts.mk	Sat Mar 12 22:21:02 2016	(r296770)
@@ -144,7 +144,10 @@ MK_${var}:=	no
 MK_${var}_SUPPORT:= no
 .else
 .if defined(KERNBUILDDIR)	# See if there's an opt_foo.h
+.if !defined(OPT_${var})
 OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo
+.export OPT_${var}
+.endif
 .if ${OPT_${var}} == ""		# nothing -> no
 MK_${var}_SUPPORT:= no
 .else