From owner-freebsd-current@FreeBSD.ORG Tue May 6 16:28:04 2014 Return-Path: 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 DBA12DD2 for ; Tue, 6 May 2014 16:28:04 +0000 (UTC) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AD37B64B for ; Tue, 6 May 2014 16:28:04 +0000 (UTC) Received: by mail-pa0-f43.google.com with SMTP id hz1so703391pad.16 for ; Tue, 06 May 2014 09:28:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=12vAlpletVngc/h/yEfKQt1W98LLyya2NB7iliK7qYM=; b=buB4z8CLTaXjeD5ysa4YGz1yHdKmrea+JAo2NNnzmSi8w/5C4v6Q8yVcdv/vXPpJQc SBdmEnpldFUe0MNkSAc2xhtHRwVm7ll6YSQXKlDCw6dT9BVJKm1EWi7prNgNWvChPLpn HKQieHhZ3Rqnrk1iVz1Idf4nQqJIkz3iHzv+ZyeDB3TZxgx7vs1R7y6/mmuEPhZVbib/ nd9p4YG7fUklSMEZRIGRaH1Rv48Z6I4n/HUDCgFs4Z5c1nTNcbV6U7yW9TD34YBLj/hq 97Wqq9prvNZDlibKnOkF8NHCuhPC2o/GbsNvPp9i8yB22acvUSPovBGngjjCvWO1cYGA BDSg== X-Gm-Message-State: ALoCoQmGNgeZQgwOHq5uucV8RpyKCC3c7hbmnZdCud4UFUwQbak7Rm6Mlnkda6zn3/3qSZ/hjtYu X-Received: by 10.66.231.40 with SMTP id td8mr8013209pac.103.1399393683567; Tue, 06 May 2014 09:28:03 -0700 (PDT) Received: from [10.64.26.239] (dc1-prod.netflix.com. [69.53.236.251]) by mx.google.com with ESMTPSA id f5sm99799755pat.11.2014.05.06.09.28.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 06 May 2014 09:28:02 -0700 (PDT) Sender: Warner Losh X-Google-Original-From: Warner Losh Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: r265431: make[4]: "/usr/src/sys/modules/drm2/Makefile" line 7: Malformed conditional (${MK_SOURCELESS_UCODE} != "no") From: Warner Losh In-Reply-To: <5368C539.8060404@freebsd.org> Date: Tue, 6 May 2014 10:28:00 -0600 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20140506124040.3b783491.ohartman@zedat.fu-berlin.de> <5368C539.8060404@freebsd.org> To: Stefan Esser X-Mailer: Apple Mail (2.1874) Cc: FreeBSD CURRENT , "O. Hartmann" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 16:28:04 -0000 On May 6, 2014, at 5:19 AM, Stefan Esser 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 > .include > .include 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=