Date: Fri, 10 Feb 2012 20:42:37 +0100 From: Robert Millan <rmh@freebsd.org> To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Konstantin Belousov <kib@freebsd.org>, Adrian Chadd <adrian@freebsd.org> Subject: Re: svn commit: r230972 - in head: share/mk sys/amd64/conf sys/i386/conf sys/modules sys/modules/drm sys/modules/sound/driver sys/modules/usb tools/build/options Message-ID: <CAOfDtXPxaMGvsfkVDcURbs9GF_TLMLJSgiFr%2BERYj11T1fdrfA@mail.gmail.com> In-Reply-To: <DF30EB99-B56C-43B8-B149-EE42A610BBFC@lists.zabbadoz.net> References: <201202040054.q140siBP012241@svn.freebsd.org> <4F2CFEE3.6070306@daemonic.se> <DF30EB99-B56C-43B8-B149-EE42A610BBFC@lists.zabbadoz.net>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
Hi all,
Sorry for the late reply. I can't keep up with mail during the week.
2012/2/4, Bjoern A. Zeeb <bzeeb-lists@lists.zabbadoz.net>:
> And can you please include GENERIC at least in these kernel configs? They
> are not building and this breaks a make universe and I guess eventually the
> tinderbox as well...
Including GENERIC sounds problematic because if both WITHOUT_* files
are included, then GENERIC is included twice! As discussed on -arch,
the idea was that users would never build WITHOUT_* directly, but
rather include them in their custom kernel config.
These files weren't intended to be picked up by "make universe" either
[1]. It just didn't occur to me that the universe target would pick
them up.
Here's a possible solution to this patch (untested). In case it looks
fine to everyone (and my mentors approve it), I'll definitely test
with "make universe" before commit.
[1] shame on me for not testing lasest version of my patch with "make
universe" -- I only tested the first one which didn't add WITHOUT_*
files.
--
Robert Millan
[-- Attachment #2 --]
Index: Makefile
===================================================================
--- Makefile (revision 230971)
+++ Makefile (working copy)
@@ -404,7 +404,7 @@
.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 ! -name WITHOUT_\*
universe_kernconfs:
.for kernel in ${KERNCONFS}
TARGET_ARCH_${kernel}!= cd ${KERNSRCDIR}/${TARGET}/conf && \
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOfDtXPxaMGvsfkVDcURbs9GF_TLMLJSgiFr%2BERYj11T1fdrfA>