Date: Sat, 12 Mar 2016 22:21:02 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296770 - head/sys/conf Message-ID: <201603122221.u2CML2L6035174@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603122221.u2CML2L6035174>