From 1facc10d63c43e5823ab879fbb0f3d0d9a0e49ae Mon Sep 17 00:00:00 2001
From: ian <ian@FreeBSD.org>
Date: Sun, 18 May 2014 00:21:14 +0000
Subject: MFC 265155, 265254:

  Omit from the universe build all config files tagged with #NO_UNIVERSE.

  Add FDT to the VYBRID kernel.
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 98b33d3..bb7a506 100644
--- a/Makefile
+++ b/Makefile
@@ -473,9 +473,15 @@ universe_kernels: universe_kernconfs
 .if !defined(TARGET)
 TARGET!=	uname -m
 .endif
+.if defined(MAKE_ALL_KERNELS)
+_THINNER=cat
+.else
+_THINNER=xargs grep -L "^.NO_UNIVERSE"
+.endif
 KERNCONFS!=	cd ${KERNSRCDIR}/${TARGET}/conf && \
 		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
-		! -name DEFAULTS ! -name NOTES
+		! -name DEFAULTS ! -name NOTES | \
+		${_THINNER}
 universe_kernconfs:
 .for kernel in ${KERNCONFS}
 TARGET_ARCH_${kernel}!=	cd ${KERNSRCDIR}/${TARGET}/conf && \
-- 
cgit v1.1