From nobody Mon May 02 20:17:57 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EE92E1AB633A for ; Mon, 2 May 2022 20:18:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe2a.google.com (mail-vs1-xe2a.google.com [IPv6:2607:f8b0:4864:20::e2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsZCh5yfwz4kbk for ; Mon, 2 May 2022 20:18:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe2a.google.com with SMTP id q2so14641110vsr.5 for ; Mon, 02 May 2022 13:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=aKLREsxQu+Ed1EP2xh4C7YGO0FB6yojmiyLADHTtamM=; b=PCQSDZFoH23YEVkbD1+DpCUB/2Ilk0cIZHYkEx6Lxw33eg0olImT8nFgjehddohgse zGCLwQDPkcw2lnBsM9ItWaGS9TNQ7KJIgz78Xmr3t2AzW+khF1kvPIaLLaiwLUoeiygO iKk1GcPvxKgDFWvZUQSSpYpv8hWujoyrGAE/Wwkaps/G099Sp/KDW+f2vBSHM8pOT+Cv fhJRd2EjtQmWmNvnSPw3kjJnThsVv9Y6IXOKQcdCFtwbTuCuJW4s4jpvmolP40wYzy+O u8thLNhlzmV/SskWo1WZvIW6yZ4ouFLmS948UccMIMFgIxVkzSMbNH6h7YWzLOJ/b03m 6t8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=aKLREsxQu+Ed1EP2xh4C7YGO0FB6yojmiyLADHTtamM=; b=bUt4V7DgCJY6bPQ0GfodEShV+e48hL7Lb/8AOwhvcsyvMoDOf4b7JJn24MdhLqFCc7 XFBffwpROvjhiUmvavIXDMuQIBAMIdcLMmq6aBVxR3uTqL8g35qYwLOb7EqK2DDaYc61 XpirEkUGrilt4/q71VjzwhHVsjfcrdAfEqbb/feBxLQMUngHVw9KD2UKV4FYErQTCrYr e+r0MMmcY9QKL++8iH2d+Ar8OTIxbdP+HCTejcycrtBDbbp/zzuSZjcB65OIiVI8lpfO trkrqJhGewrhs0Nfh050LGxnZf9jTVSUmb0mc8OkMzH1aHXWEGP6BpKwV633TeGjo4th G5cA== X-Gm-Message-State: AOAM533K2KKC/F2FwvCGC0thfEGswY078ACbexwDlp7rIqzHCWJ9b7cP OrAbTl/by7vRSFmT1BZ4Ffu6/bS3FRGNMSI53nSY2w== X-Google-Smtp-Source: ABdhPJw5PzIxNJBbRJv5CqizhALteGW4Dz+6n85wA1HfExFPqVeguOIq8MyzqAHCW8hwQtt4Qb6WjwDuiXESTLWUxnw= X-Received: by 2002:a67:746:0:b0:328:33e3:6079 with SMTP id 67-20020a670746000000b0032833e36079mr3811022vsh.17.1651522688224; Mon, 02 May 2022 13:18:08 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202204051955.235JtxdD052454@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Mon, 2 May 2022 14:17:57 -0600 Message-ID: Subject: Re: git: ff8d9d9c5618 - main - config.mk: Add opt_platform.h support To: Ed Maste Cc: Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002ba3d405de0d1783" X-Rspamd-Queue-Id: 4KsZCh5yfwz4kbk X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N --0000000000002ba3d405de0d1783 Content-Type: text/plain; charset="UTF-8" On Mon, May 2, 2022 at 1:39 PM Ed Maste wrote: > On Tue, 5 Apr 2022 at 15:56, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ff8d9d9c56185d38f507ffe2659cfd13633b9a12 > > > > commit ff8d9d9c56185d38f507ffe2659cfd13633b9a12 > > Author: Warner Losh > > AuthorDate: 2022-04-05 19:39:09 +0000 > > Commit: Warner Losh > > CommitDate: 2022-04-05 19:52:55 +0000 > > > > config.mk: Add opt_platform.h support > > > > opt_platform.h is now included from miivar.h, so add support for > > generating it in the standalone build case. > > This broke generation of src.conf.5, which reports that WITHOUT_FDT is > the default after this change. Running `make makman` reports: > amd64/amd64: ignoring duplicate option FDT > arm/armv6: ignoring duplicate option FDT > ... > > Indeed, `make showconfig` shows MK_FDT is both yes and no: > $ make showconfig | grep FDT > MK_FDT = no > MK_FDT = yes > Indeed. I'll get the userland and kernel back in sync. Warner --0000000000002ba3d405de0d1783 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, May 2, 2022 at 1:39 PM Ed Mas= te <emaste@freebsd.org> wro= te:
On Tue, 5 Ap= r 2022 at 15:56, Warner Losh <imp@freebsd.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3Dff8d9d9c56185d38f507ffe2659cfd13633b9a12<= /a>
>
> commit ff8d9d9c56185d38f507ffe2659cfd13633b9a12
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2022-04-05 19:39:09 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2022-04-05 19:52:55 +0000
>
>=C2=A0 =C2=A0 =C2=A0config.mk: Add opt_platform.h support
>
>=C2=A0 =C2=A0 =C2=A0opt_platform.h is now included from miivar.h, so ad= d support for
>=C2=A0 =C2=A0 =C2=A0generating it in the standalone build case.

This broke generation of src.conf.5, which reports that WITHOUT_FDT is
the default after this change. Running `make makman` reports:
amd64/amd64: ignoring duplicate option FDT
arm/armv6: ignoring duplicate option FDT
...

Indeed, `make showconfig` shows MK_FDT is both yes and no:
$ make showconfig | grep FDT
MK_FDT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D no
MK_FDT=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=3D yes

Indeed. I'll get the userland and kernel back in sync.<= /div>

Warner=C2=A0
--0000000000002ba3d405de0d1783--