Matthias Maennich a325db2d8f scripts: merge_config: add strict mode to fail upon any redefinition ...

When merging configuration fragments, it might be of interest to
identify mismatches (redefinitions) programmatically. Hence add the
option -s (strict mode) to instruct merge_config.sh to bail out in
case any redefinition has been detected.

With strict mode, warnings are emitted as before, but the script
terminates with rc=1. If -y is set to define "builtin having
precedence over modules", fragments are still allowed to set =m (while
the base config has =y). Strict mode will tolerate that as demotions
from =y to =m are ignored when setting -y.

Signed-off-by: Matthias Maennich <maennich@google.com>
Reviewed-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

2021-08-10 08:23:39 +09:00

..

lxdialog

kconfig: lxdialog: A spello fix and a punctuation added

2021-04-14 15:22:49 +09:00

tests

kconfig: change "modules" from sub-option to first-level attribute

2021-04-14 15:22:49 +09:00

.gitignore

kconfig: refactor .gitignore

2021-04-26 02:17:39 +09:00

conf.c

kconfig: constify long_opts

2021-06-05 23:49:46 +09:00

confdata.c

Kconfig updates for v5.13

2021-04-29 14:32:00 -07:00

expr.c

kconfig: distinguish between dependencies and visibility in help text

2020-01-07 02:18:45 +09:00

expr.h

kconfig: remove allnoconfig_y option

2021-04-14 15:22:49 +09:00

gconf-cfg.sh

kconfig: do not require pkg-config on make {menu,n}config

2018-09-03 02:13:48 +09:00

gconf.c

kconfig: highlight gconfig 'comment' lines with '***'

2021-04-19 14:57:16 +09:00

gconf.glade

scripts/kconfig/gconf.glade Update broken web addresses.

2010-09-17 16:54:42 +02:00

images.c

kconfig: constify XPM data

2020-08-14 13:30:03 +09:00

images.h

kconfig: constify XPM data

2020-08-14 13:30:03 +09:00

internal.h

kconfig: split menu.c out of parser.y

2021-04-14 15:26:09 +09:00

lexer.l

kconfig: change "modules" from sub-option to first-level attribute

2021-04-14 15:22:49 +09:00

list.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

lkc_proto.h

kconfig: change sym_change_count to a boolean flag

2021-04-14 15:22:49 +09:00

lkc.h

kconfig: remove unused PACKAGE definition

2021-04-19 14:50:16 +09:00

Makefile

kconfig: split menu.c out of parser.y

2021-04-14 15:26:09 +09:00

mconf-cfg.sh

kconfig: mconf: fix HOSTCC call

2021-01-27 03:17:42 +09:00

mconf.c

kconfig: mconf,nconf: remove unneeded '\0' termination after snprintf()

2021-04-14 15:22:49 +09:00

menu.c

kconfig: split menu.c out of parser.y

2021-04-14 15:26:09 +09:00

merge_config.sh

scripts: merge_config: add strict mode to fail upon any redefinition

2021-08-10 08:23:39 +09:00

nconf-cfg.sh

kconfig: be more helpful if pkg-config is missing

2019-11-11 20:10:01 +09:00

nconf.c

kconfig: nconf: stop endless search loops

2021-04-16 14:39:12 +09:00

nconf.gui.c

kconfig: nconf: refactor in print_in_middle()

2021-04-14 15:25:43 +09:00

nconf.h

kconfig: nconf: refactor in print_in_middle()

2021-04-14 15:25:43 +09:00

parser.y

kconfig: split menu.c out of parser.y

2021-04-14 15:26:09 +09:00

preprocess.c

kconfig: fix return value of do_error_if()

2020-12-21 14:48:54 +09:00

qconf-cfg.sh

kconfig: qconf: use a variable to pass packages to pkg-config

2020-12-08 23:31:29 +09:00

qconf.cc

kconfig: highlight xconfig 'comment' lines with '***'

2021-04-19 14:58:23 +09:00

qconf.h

kconfig: qconf: remove Y, M, N columns

2020-09-25 00:37:13 +09:00

streamline_config.pl

streamline_config.pl: add softtabstop=4 for vim users

2021-06-29 10:53:45 -07:00

symbol.c

kconfig: change sym_change_count to a boolean flag

2021-04-14 15:22:49 +09:00

util.c

kconfig: convert to SPDX License Identifier

2018-12-28 22:22:28 +09:00