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

[Stefan Esser]

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:

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>

Index: sys/modules/drm2/Makefile
===================================================================
--- sys/modules/drm2/Makefile~
+++ sys/modules/drm2/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$

+.include <src.opts.mk>
 .include <bsd.own.mk>

 .if ${MACHINE_CPUARCH} == "amd64"

Not sure whether this is the best way to resolve this problem, but
it let me compile a kernel again ...

Regards, STefan