Date: Tue, 6 May 2014 10:28:00 -0600
From: Warner Losh <imp@bsdimp.com>
To: Stefan Esser <se@freebsd.org>
Cc: FreeBSD CURRENT <freebsd-current@freebsd.org>, "O. Hartmann" <ohartman@zedat.fu-berlin.de>
Subject: Re: r265431: make[4]: "/usr/src/sys/modules/drm2/Makefile" line 7: Malformed conditional (${MK_SOURCELESS_UCODE} != "no")
Message-ID: <F4FCBC1D-9793-4ECC-AA18-49D9D142BC0C@gmail.com>
In-Reply-To: <5368C539.8060404@freebsd.org>
References: <20140506124040.3b783491.ohartman@zedat.fu-berlin.de> <5368C539.8060404@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On May 6, 2014, at 5:19 AM, Stefan Esser <se@freebsd.org> wrote:
> Am 06.05.2014 12:40, schrieb O. Hartmann:
>> A buildkernel fails on r265431 with the following error:
>>=20
>> =3D=3D=3D> drm2 (cleandir) make[4]: =
"/usr/src/sys/modules/drm2/Makefile"
>> line 7: Malformed conditional (${MK_SOURCELESS_UCODE} !=3D "no")
>> make[4]: Fatal errors encountered -- cannot continue make[4]:
>> stopped in /usr/src/sys/modules/drm2 *** [cleandir] Error code 1
>=20
> 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=85 This might have broken a couple of =
things, but
what it fixes are much more important cases...
> Index: sys/conf/kmod.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- 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
>=20
> +.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=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F4FCBC1D-9793-4ECC-AA18-49D9D142BC0C>