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. 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. 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. libnv has been added to -legacy for the time being to support the build of config(8) with the new cnvlist API. Tested with: universe (11 host & 12 host) MFC after: 1 month
28 lines
506 B
Makefile
28 lines
506 B
Makefile
# @(#)Makefile 8.1 (Berkeley) 6/6/93
|
|
# $FreeBSD$
|
|
|
|
SRCDIR:=${.PARSEDIR:tA}
|
|
|
|
PROG= config
|
|
MAN= config.5 config.8
|
|
SRCS= config.y main.c lang.l mkmakefile.c mkheaders.c \
|
|
mkoptions.c y.tab.h kernconf.c
|
|
|
|
FILE2C?=file2c
|
|
|
|
kernconf.c: kernconf.tmpl
|
|
${FILE2C} 'char kernconfstr[] = {' ',0};' < \
|
|
${SRCDIR}/kernconf.tmpl > kernconf.c
|
|
|
|
CFLAGS+= -I. -I${SRCDIR} -I${SRCTOP}/sys
|
|
|
|
NO_WMISSING_VARIABLE_DECLARATIONS=
|
|
|
|
LIBADD= l nv sbuf
|
|
|
|
CLEANFILES+= kernconf.c
|
|
|
|
mkmakefile.o: configvers.h
|
|
|
|
.include <bsd.prog.mk>
|