Date: Thu, 5 Jul 2018 19:32:57 +0100 From: Andrew Turner <andrew@fubar.geek.nz> To: Kyle Evans <kevans@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r336011 - head/usr.sbin/config Message-ID: <6F4B0D2B-4155-42E2-8C13-8F3A355E3BC3@fubar.geek.nz> In-Reply-To: <201807051753.w65HrpQm085589@repo.freebsd.org> References: <201807051753.w65HrpQm085589@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6F4B0D2B-4155-42E2-8C13-8F3A355E3BC3>