From owner-freebsd-current@FreeBSD.ORG  Tue May  6 11:26:43 2014
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2E0F6B17
 for <freebsd-current@freebsd.org>; Tue,  6 May 2014 11:26:43 +0000 (UTC)
Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mailout00.t-online.de",
 Issuer "TeleSec ServerPass DE-1" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E3279A38
 for <freebsd-current@freebsd.org>; Tue,  6 May 2014 11:26:42 +0000 (UTC)
Received: from fwd22.aul.t-online.de (fwd22.aul.t-online.de [172.20.26.127])
 by mailout12.t-online.de (Postfix) with SMTP id 66851304162;
 Tue,  6 May 2014 13:19:02 +0200 (CEST)
Received: from [192.168.119.11]
 (ZwUmZEZDrhmmC2J9HRCjkyrrNkbIlRymQwGZn6KgRFJOcThKirLiVg2NULexEn+wcl@[84.154.114.101])
 by fwd22.t-online.de
 with esmtp id 1WhdPC-15VEMy0; Tue, 6 May 2014 13:19:26 +0200
Message-ID: <5368C539.8060404@freebsd.org>
Date: Tue, 06 May 2014 13:19:21 +0200
From: Stefan Esser <se@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:24.0) Gecko/20100101 Thunderbird/24.5.0
MIME-Version: 1.0
To: 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")
References: <20140506124040.3b783491.ohartman@zedat.fu-berlin.de>
In-Reply-To: <20140506124040.3b783491.ohartman@zedat.fu-berlin.de>
X-Enigmail-Version: 1.6
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-ID: ZwUmZEZDrhmmC2J9HRCjkyrrNkbIlRymQwGZn6KgRFJOcThKirLiVg2NULexEn+wcl
X-TOI-MSGID: 9e349648-cf35-4e39-ac81-cdaf33c05a75
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 May 2014 11:26:43 -0000

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