From owner-freebsd-current@FreeBSD.ORG Tue May 6 11:44:41 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9EA0BF69; Tue, 6 May 2014 11:44:41 +0000 (UTC) Received: from smtp.fagskolen.gjovik.no (smtp.fagskolen.gjovik.no [IPv6:2001:700:1100:1:200:ff:fe00:b]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "smtp.fagskolen.gjovik.no", Issuer "Fagskolen i Gj??vik" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 706BBC7A; Tue, 6 May 2014 11:44:40 +0000 (UTC) Received: from mail.fig.ol.no (localhost [127.0.0.1]) by mail.fig.ol.no (8.14.8/8.14.8) with ESMTP id s46BiXMf074882 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 May 2014 13:44:33 +0200 (CEST) (envelope-from trond@fagskolen.gjovik.no) Received: from localhost (trond@localhost) by mail.fig.ol.no (8.14.8/8.14.8/Submit) with ESMTP id s46BiXRR074879; Tue, 6 May 2014 13:44:33 +0200 (CEST) (envelope-from trond@fagskolen.gjovik.no) X-Authentication-Warning: mail.fig.ol.no: trond owned process doing -bs Date: Tue, 6 May 2014 13:44:33 +0200 (CEST) From: =?ISO-8859-1?Q?Trond_Endrest=F8l?= Sender: Trond.Endrestol@fagskolen.gjovik.no To: Stefan Esser Subject: Re: buildworld fails (missing /usr/share/mk/src.opts.mk) In-Reply-To: <5368C675.1070700@freebsd.org> Message-ID: References: <5368B0C5.6040309@freebsd.org> <5368C675.1070700@freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) Organization: Fagskolen Innlandet OpenPGP: url=http://fig.ol.no/~trond/trond.key MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.fig.ol.no Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT X-Content-Filtered-By: Mailman/MimeDel 2.1.18 Cc: freebsd-current@freebsd.org, imp@freebsd.org 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 11:44:41 -0000 On Tue, 6 May 2014 13:24+0200, Stefan Esser wrote: > Am 06.05.2014 11:52, schrieb Stefan Esser: > > Hi Warner, > > > > as already reported by Jenkins, HEAD does not build. > > > > Seems that this is caused by src.opts.mk missing in /usr/share/mk > > during the cleandir phase. I guess this is kind of a bootstrap > > issue - the definitions are looked up in the installed base, not > > in the src tree - but did not verify this assumption. > > > > A work-around is to manually install src.opts.mk: > > > > # make -C /usr/src/share/mk install > > > > (which might deserve an UPDATING entry). Falling back on the file > > in the src directory might be a better solution ... > > > > Regards, STefan > > Following up to my earlier mail: > > The diagnosis was wrong - the main Makefiles include src.opts.mk from > the source directory. But two sub-ordinate Makefiles missed to include > the new options file (sys/conf/kmod.mk and sys/modules/drm2/Makefile). > > I committed a fix/work-around to stop the flood of tinderbox messages > (r265433). tinderbox still complains about usr.bin/bmake/Makefile.inc. -- +-------------------------------+------------------------------------+ | Vennlig hilsen, | Best regards, | | Trond Endrestøl, | Trond Endrestøl, | | IT-ansvarlig, | System administrator, | | Fagskolen Innlandet, | Gjøvik Technical College, Norway, | | tlf. mob. 952 62 567, | Cellular...: +47 952 62 567, | | sentralbord 61 14 54 00. | Switchboard: +47 61 14 54 00. | +-------------------------------+------------------------------------+ From owner-freebsd-current@FreeBSD.ORG Tue May 6 11:46:39 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 2F9B513A; Tue, 6 May 2014 11:46:39 +0000 (UTC) Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C558CCA1; Tue, 6 May 2014 11:46:38 +0000 (UTC) Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost.zedat.fu-berlin.de (Exim 4.82) with esmtp (envelope-from ) id <1WhdpU-001hvd-WF>; Tue, 06 May 2014 13:46:37 +0200 Received: from g226062030.adsl.alicedsl.de ([92.226.62.30] helo=thor.walstatt.dynvpn.de) by inpost2.zedat.fu-berlin.de (Exim 4.82) with esmtpsa (envelope-from ) id <1WhdpU-000H2l-Sf>; Tue, 06 May 2014 13:46:36 +0200 Date: Tue, 6 May 2014 13:46:31 +0200 From: "O. Hartmann" To: Stefan Esser Subject: Re: r265431: make[4]: "/usr/src/sys/modules/drm2/Makefile" line 7: Malformed conditional (${MK_SOURCELESS_UCODE} != "no") Message-ID: <20140506134631.3eb00d66.ohartman@zedat.fu-berlin.de> In-Reply-To: <5368C539.8060404@freebsd.org> References: <20140506124040.3b783491.ohartman@zedat.fu-berlin.de> <5368C539.8060404@freebsd.org> Organization: FU Berlin X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/pYaQjbRQ5OBDV_L_k5rhW3H"; protocol="application/pgp-signature" X-Originating-IP: 92.226.62.30 X-ZEDAT-Hint: A Cc: freebsd-current@freebsd.org 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 11:46:39 -0000 --Sig_/pYaQjbRQ5OBDV_L_k5rhW3H Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Tue, 06 May 2014 13:19:21 +0200 Stefan Esser schrieb: > 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: >=20 > 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 >=20 > Index: sys/modules/drm2/Makefile > =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/modules/drm2/Makefile~ > +++ sys/modules/drm2/Makefile > @@ -1,5 +1,6 @@ > # $FreeBSD$ >=20 > +.include > .include >=20 > .if ${MACHINE_CPUARCH} =3D=3D "amd64" >=20 > Not sure whether this is the best way to resolve this problem, but > it let me compile a kernel again ... >=20 > Regards, STefan > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" Ah, that helped, Dankesch=C3=B6n. Oliver --Sig_/pYaQjbRQ5OBDV_L_k5rhW3H Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQEcBAEBAgAGBQJTaMucAAoJEOgBcD7A/5N84g8H/0R/bZXpu0QSoTpCgreySH2A ocav/kuPHB0VrlJRucEMIN+xvi53SYhl16GJtNs6VT7pIH8JIkFxr8zg+QU/5KOG 9LawxyHx07WiXXV/GE7FpbyrX2Qmz3GGz7/7uQSgMdtayqyBouWUKaU2Ph1IHkFE FDCH5ecJRchulJLT6A+gkg/Awi9ao5R6bu5lrSY99VxrM50ZBg03Qlwk7OMib/UR X3SbK8PghhNsgOi/Gwb2/aAA4yhXrlm8PF8XzHsis8JK8tXTW+jpNDCgREYjPqHU evK+1ApGISfqwX7zoigBBqqL90OSzsN0rXS+m/R3FZQnVHy/lh2aBIRGf2OJQhI= =WZ88 -----END PGP SIGNATURE----- --Sig_/pYaQjbRQ5OBDV_L_k5rhW3H--