svn commit: r265155 - in head: . sys/arm/conf
Warner Losh
imp at FreeBSD.org
Wed Apr 30 18:02:14 UTC 2014
Author: imp
Date: Wed Apr 30 18:02:10 2014
New Revision: 265155
URL: http://svnweb.freebsd.org/changeset/base/265155
Log:
Omit from the universe build all config files tagged with
#NO_UNIVERSE. Many of these config files are important examples, but
add little to no regresive value to the intended purpose of
UNIVERSE. We now build over 120 kernels during universe. There's
really little to no value to this over building say 60 or even 30 of
them (either is still a way too big number). This is especially true
for kernels that are nothing more than including a common base and
adding a static DTB file. Start by pruning 1/3 of the arm kernels that
add little regresion value.
Added:
head/sys/arm/conf/VYBRID
- copied, changed from r265154, head/sys/arm/conf/VYBRID.common
Deleted:
head/sys/arm/conf/VYBRID.common
Modified:
head/Makefile
head/sys/arm/conf/ARNDALE
head/sys/arm/conf/BWCT
head/sys/arm/conf/COLIBRI-VF50
head/sys/arm/conf/COSMIC
head/sys/arm/conf/EB9200
head/sys/arm/conf/ETHERNUT5
head/sys/arm/conf/HL200
head/sys/arm/conf/HL201
head/sys/arm/conf/KB920X
head/sys/arm/conf/NSLU
head/sys/arm/conf/QILA9G20
head/sys/arm/conf/QUARTZ
head/sys/arm/conf/SAM9260EK
head/sys/arm/conf/SAM9X25EK
head/sys/arm/conf/SN9G45
head/sys/arm/conf/WANDBOARD-DUAL
head/sys/arm/conf/WANDBOARD-QUAD
head/sys/arm/conf/WANDBOARD-SOLO
Modified: head/Makefile
==============================================================================
--- head/Makefile Wed Apr 30 18:02:04 2014 (r265154)
+++ head/Makefile Wed Apr 30 18:02:10 2014 (r265155)
@@ -458,9 +458,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 && \
Modified: head/sys/arm/conf/ARNDALE
==============================================================================
--- head/sys/arm/conf/ARNDALE Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/ARNDALE Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "EXYNOS5250.common"
ident ARNDALE
Modified: head/sys/arm/conf/BWCT
==============================================================================
--- head/sys/arm/conf/BWCT Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/BWCT Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident BWCT
options VERBOSE_INIT_ARM
Modified: head/sys/arm/conf/COLIBRI-VF50
==============================================================================
--- head/sys/arm/conf/COLIBRI-VF50 Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/COLIBRI-VF50 Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident COLIBRI-VF50
#FDT
Modified: head/sys/arm/conf/COSMIC
==============================================================================
--- head/sys/arm/conf/COSMIC Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/COSMIC Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident COSMIC
#FDT
Modified: head/sys/arm/conf/EB9200
==============================================================================
--- head/sys/arm/conf/EB9200 Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/EB9200 Wed Apr 30 18:02:10 2014 (r265155)
@@ -12,6 +12,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident EB9200
include "../at91/std.eb9200"
Modified: head/sys/arm/conf/ETHERNUT5
==============================================================================
--- head/sys/arm/conf/ETHERNUT5 Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/ETHERNUT5 Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident ETHERNUT5
include "../at91/std.ethernut5"
Modified: head/sys/arm/conf/HL200
==============================================================================
--- head/sys/arm/conf/HL200 Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/HL200 Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident HL200
include "../at91/std.hl200"
Modified: head/sys/arm/conf/HL201
==============================================================================
--- head/sys/arm/conf/HL201 Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/HL201 Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident HL201
include "../at91/std.hl201"
Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/KB920X Wed Apr 30 18:02:10 2014 (r265155)
@@ -18,6 +18,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident KB920X
include "../at91/std.kb920x"
Modified: head/sys/arm/conf/NSLU
==============================================================================
--- head/sys/arm/conf/NSLU Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/NSLU Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident NSLU
# XXX What is defined in std.avila does not exactly match the following:
Modified: head/sys/arm/conf/QILA9G20
==============================================================================
--- head/sys/arm/conf/QILA9G20 Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/QILA9G20 Wed Apr 30 18:02:10 2014 (r265155)
@@ -18,6 +18,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident QILA9G20
include "../at91/std.qila9g20"
Modified: head/sys/arm/conf/QUARTZ
==============================================================================
--- head/sys/arm/conf/QUARTZ Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/QUARTZ Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,7 +17,9 @@
#
# $FreeBSD$
-include "VYBRID.common"
+#NO_UNIVERSE
+
+include "VYBRID"
ident QUARTZ
#FDT
Modified: head/sys/arm/conf/SAM9260EK
==============================================================================
--- head/sys/arm/conf/SAM9260EK Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/SAM9260EK Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident SAM9260EK
include "../at91/std.sam9260ek"
Modified: head/sys/arm/conf/SAM9X25EK
==============================================================================
--- head/sys/arm/conf/SAM9X25EK Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/SAM9X25EK Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,7 +17,8 @@
#
# $FreeBSD$
-# NOUNIVERSE: disable building in make universe
+#NO_UNIVERSE
+
ident SAM9X25EK
include "../at91/std.sam9x25ek"
Modified: head/sys/arm/conf/SN9G45
==============================================================================
--- head/sys/arm/conf/SN9G45 Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/SN9G45 Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
ident SN9G45
include "../at91/std.sn9g45"
Copied and modified: head/sys/arm/conf/VYBRID (from r265154, head/sys/arm/conf/VYBRID.common)
==============================================================================
--- head/sys/arm/conf/VYBRID.common Wed Apr 30 18:02:04 2014 (r265154, copy source)
+++ head/sys/arm/conf/VYBRID Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,7 @@
#
# $FreeBSD$
+ident VYBRID
include "../freescale/vybrid/std.vybrid"
makeoptions MODULES_OVERRIDE=""
Modified: head/sys/arm/conf/WANDBOARD-DUAL
==============================================================================
--- head/sys/arm/conf/WANDBOARD-DUAL Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/WANDBOARD-DUAL Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-DUAL
Modified: head/sys/arm/conf/WANDBOARD-QUAD
==============================================================================
--- head/sys/arm/conf/WANDBOARD-QUAD Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/WANDBOARD-QUAD Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-QUAD
Modified: head/sys/arm/conf/WANDBOARD-SOLO
==============================================================================
--- head/sys/arm/conf/WANDBOARD-SOLO Wed Apr 30 18:02:04 2014 (r265154)
+++ head/sys/arm/conf/WANDBOARD-SOLO Wed Apr 30 18:02:10 2014 (r265155)
@@ -17,6 +17,8 @@
#
# $FreeBSD$
+#NO_UNIVERSE
+
include "IMX6"
ident WANDBOARD-SOLO
More information about the svn-src-head
mailing list