7b87c2ae81
We are using empty CONFIG_PREFIX_. This results in false positive match
for comment lines when merging config fragments.
To avoid false positive reports, we use separate sed expressions and
address comment lines explicitly.
This is actually is in the Linux kernel mainline (v4.20-rc2):
6bbe4385d035c6fac56f840a59861a0310ce137b
("kconfig: merge_config: avoid false positive matches from comment lines")
Signed-off-by: Nasser Afshin <Afshin.Nasser@gmail.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||
|---|---|---|
| .. | ||
| lxdialog | ||
| patches | ||
| .gitignore | ||
| check.sh | ||
| conf.c | ||
| confdata.c | ||
| expr.c | ||
| expr.h | ||
| foo.h | ||
| gconf.c | ||
| gconf.glade | ||
| images.c | ||
| kconf_id.c | ||
| kxgettext.c | ||
| list.h | ||
| lkc_proto.h | ||
| lkc.h | ||
| Makefile | ||
| Makefile.br | ||
| mconf.c | ||
| menu.c | ||
| merge_config.sh | ||
| nconf.c | ||
| nconf.gui.c | ||
| nconf.h | ||
| POTFILES.in | ||
| qconf.cc | ||
| qconf.h | ||
| README.buildroot | ||
| streamline_config.pl | ||
| symbol.c | ||
| util.c | ||
| zconf.l | ||
| zconf.lex.c_shipped | ||
| zconf.tab.c_shipped | ||
| zconf.y | ||
This is a copy of the kconfig code in the kernel (currently 4.17-rc2) tweaked to suit Buildroot. To update: cp -r /usr/src/linux/scripts/kconfig support/kconfig.new cd support/kconfig.new # zconf.lex.c and zconf.tab.c needs to be generated by 'make menuconfig' mv zconf.lex.c zconf.lex.c_shipped mv zconf.tab.c zconf.tab.c_shipped rm -rf tests/ cp -a ../kconfig/patches ../kconfig/README.buildroot ../kconfig/.gitignore . quilt push -a # Fix any conflict cd .. rm -rf kconfig mv kconfig.new kconfig Then verify the toplevel targets work: config defconfig menuconfig nconfig xconfig gconfig oldconfig