From owner-svn-src-head@freebsd.org  Thu Jul  5 18:33:00 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E40E1016344;
 Thu,  5 Jul 2018 18:33:00 +0000 (UTC)
 (envelope-from andrew@fubar.geek.nz)
Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16])
 by mx1.freebsd.org (Postfix) with ESMTP id B2E3F8F36D;
 Thu,  5 Jul 2018 18:32:58 +0000 (UTC)
 (envelope-from andrew@fubar.geek.nz)
Received: from [IPv6:2001:630:212:2a8:3442:2c0b:60cd:e735] (unknown
 [IPv6:2001:630:212:2a8:3442:2c0b:60cd:e735])
 by fry.fubar.geek.nz (Postfix) with ESMTPSA id 65AD84E628;
 Thu,  5 Jul 2018 18:32:58 +0000 (UTC)
Content-Type: text/plain;
	charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 11.4 \(3445.8.2\))
Subject: Re: svn commit: r336011 - head/usr.sbin/config
From: Andrew Turner <andrew@fubar.geek.nz>
In-Reply-To: <201807051753.w65HrpQm085589@repo.freebsd.org>
Date: Thu, 5 Jul 2018 19:32:57 +0100
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <6F4B0D2B-4155-42E2-8C13-8F3A355E3BC3@fubar.geek.nz>
References: <201807051753.w65HrpQm085589@repo.freebsd.org>
To: Kyle Evans <kevans@FreeBSD.org>
X-Mailer: Apple Mail (2.3445.8.2)
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jul 2018 18:33:00 -0000


> On 5 Jul 2018, at 18:53, Kyle Evans <kevans@FreeBSD.org> wrote:
>=20
> Author: kevans
> Date: Thu Jul  5 17:53:51 2018
> New Revision: 336011
> URL: https://svnweb.freebsd.org/changeset/base/336011
>=20
> Log:
>  config(8): De-dupe hint/env vars within a single file
>=20
>  r335653 flipped the order in which hints/env files are concatenated =
to match
>  the order in which vars are processed by the kernel. This is the =
other
>  hammer to drop.
>=20
>  Use nv(9) to de-dupe entries within a single `hint` or `env` file, =
using the
>  latest value specified for a key. This leaves some duplicates if a =
variable
>  is specified in multiple hint/env files or via `envvar` in a kernel =
config,
>  but the reversed order of concatenation (from r335653) makes this a
>  non-issue as the latest-specified version will be seen first.
>=20
>  This change also silently rewrote hint bits to use the same =
sanitization
>  process that ian@ wrote for r335642. To the kernel, hints and env =
vars are
>  basically the same thing through early boot, then get merged into the
>  dynamic environment once kmem becomes available and the dynamic =
environment
>  is created. They should be subjected to the same restrictions.
>=20
>  MFC after:	1 month
>=20
> Modified:
>  head/usr.sbin/config/Makefile
>  head/usr.sbin/config/mkmakefile.c
>=20
> Modified: head/usr.sbin/config/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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/usr.sbin/config/Makefile	Thu Jul  5 17:28:06 2018	=
(r336010)
> +++ head/usr.sbin/config/Makefile	Thu Jul  5 17:53:51 2018	=
(r336011)
> @@ -18,7 +18,7 @@ CFLAGS+=3D -I. -I${SRCDIR}
>=20
> NO_WMISSING_VARIABLE_DECLARATIONS=3D
>=20
> -LIBADD=3D	l sbuf
> +LIBADD=3D	l nv sbuf
>=20
> CLEANFILES+=3D	kernconf.c
>=20
>=20
> Modified: head/usr.sbin/config/mkmakefile.c
> =
=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=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- head/usr.sbin/config/mkmakefile.c	Thu Jul  5 17:28:06 2018	=
(r336010)
> +++ head/usr.sbin/config/mkmakefile.c	Thu Jul  5 17:53:51 2018	=
(r336011)
> @@ -49,6 +49,8 @@ static const char rcsid[] =3D
> #include <stdbool.h>
> #include <stdio.h>
> #include <string.h>
> +#include <sys/cnv.h>
> +#include <sys/nv.h>

It looks like this breaks the build from 11 [1]. cnv.h doesn=E2=80=99t =
exist there.

Andrew

[1] https://ci.freebsd.org/job/FreeBSD-head-aarch64-build/8427/console