diff options
author | Kyle Evans <kevans@FreeBSD.org> | 2019-01-06 02:13:16 +0000 |
---|---|---|
committer | Kyle Evans <kevans@FreeBSD.org> | 2019-01-06 02:13:16 +0000 |
commit | 557183abd108a4a3ecb8e2396c8d94e4c508a923 (patch) | |
tree | 27bbdad435b00a5f1c7c1bf469315239a2dc7456 /ObsoleteFiles.inc | |
parent | f6be65e0eada4ded24f04eb1e5f5ae23a4664222 (diff) | |
download | src-557183abd108a4a3ecb8e2396c8d94e4c508a923.tar.gz src-557183abd108a4a3ecb8e2396c8d94e4c508a923.zip |
MFC r342362-r342363: config(8) duplicate option handling
r342362:
config(8): Allow duplicate options to be specified
config(8)'s option handling has been written to allow duplicate options; if
the value changes, then the latest value is used and an informative message
is printed to stderr like so:
/usr/src/sys/amd64/conf/TEST: option "VERBOSE_SYSINIT" redefined from 0 to 1
Currently, this is only a possibility for cpu types, MAXUSERS, and
MACHINE_ARCH. Anything else duplicated in a config file will use the first
value set and error about duplicated options on subsequent appearances,
which is arguably unfriendly since one could specify:
include GENERIC
nooptions VERBOSE_SYSINIT
options VERBOSE_SYSINIT
to redefine the value later anyways.
Reported by: mmacy
r342363:
config(8): Remove all instances of an option when opting out
Quick follow-up to r342362: options can appear multiple times now, so
clean up all of them as needed. For non-OPTIONS options, this has no effect
since they're already de-duplicated.
Notes
Notes:
svn path=/stable/11/; revision=342807
Diffstat (limited to 'ObsoleteFiles.inc')
-rw-r--r-- | ObsoleteFiles.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 536f447f5101..bcc99de75415 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20181115: libbe(3) SHLIBDIR fixed to reflect correct location +OLD_LIBS+=usr/lib/libbe.so.1 # 20180812: move of libmlx5.so.1 and libibverbs.so.1 OLD_LIBS+=usr/lib/libmlx5.so.1 OLD_LIBS+=usr/lib/libibverbs.so.1 |