r265431: make[4]: "/usr/src/sys/modules/drm2/Makefile" line 7: Malformed conditional (${MK_SOURCELESS_UCODE} != "no")

[Warner Losh]

On May 6, 2014, at 5:19 AM, Stefan Esser <se at freebsd.org> wrote:

> Am 06.05.2014 12:40, schrieb O. Hartmann:
>> A buildkernel fails on r265431 with the following error:
>> 
>> ===> drm2 (cleandir) make[4]: "/usr/src/sys/modules/drm2/Makefile"
>> line 7: Malformed conditional (${MK_SOURCELESS_UCODE} != "no")
>> make[4]: Fatal errors encountered -- cannot continue make[4]:
>> stopped in /usr/src/sys/modules/drm2 *** [cleandir] Error code 1
> 
> I just committed a fix (r265433). There were two sub-ordinate Makefiles
> that missed an .include of src.opts.mk:

Thanks for the quick action… This might have broken a couple of things, but
what it fixes are much more important cases...

> Index: sys/conf/kmod.mk
> ===================================================================
> --- sys/conf/kmod.mk~
> +++ sys/conf/kmod.mk
> @@ -72,6 +72,7 @@
> .error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND"
> .endif
> 
> +.include <src.opts.mk>
> .include <bsd.init.mk>
> .include <bsd.compiler.mk>

This change may need to be a sinclude, and brings up a philosophical
question: Should people building modules outside of the source tree get
the /etc/src.conf settings or no?

Warner