support/kconfig/merge_config.sh: avoid false positive matches from comment lines
authorNasser Afshin <Afshin.Nasser@gmail.com>
Wed, 14 Nov 2018 07:11:56 +0000 (10:41 +0330)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 24 Nov 2018 09:11:15 +0000 (10:11 +0100)
commit7b87c2ae816c1395154779a3b907ad660c18dd35
tree81cfb6c6d7aa0d17e64d5df26231017fb174e130
parent8ca206e5a14167ae86b9aba9a65e2392edcb9a70
support/kconfig/merge_config.sh: avoid false positive matches from comment lines

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>
support/kconfig/merge_config.sh
support/kconfig/patches/21-Avoid-false-positive-matches-from-comment-lines.patch [new file with mode: 0644]
support/kconfig/patches/series