]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
scripts: kconfig: merge_config: config files: add a trailing newline
authorAnders Roxell <anders.roxell@linaro.org>
Mon, 5 Aug 2024 09:22:34 +0000 (11:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Sep 2024 17:24:05 +0000 (19:24 +0200)
commit86a1aaee7f44e13c1ad3c86043df2c89b85a4f54
tree291845167ba99540fa7f396e02b885997e246cf1
parent1d5c7d0a49ec9d8786f266ac6d1d7c4960e1787b
scripts: kconfig: merge_config: config files: add a trailing newline

[ Upstream commit 33330bcf031818e60a816db0cfd3add9eecc3b28 ]

When merging files without trailing newlines at the end of the file, two
config fragments end up at the same row if file1.config doens't have a
trailing newline at the end of the file.

file1.config "CONFIG_1=y"
file2.config "CONFIG_2=y"
./scripts/kconfig/merge_config.sh -m .config file1.config file2.config

This will generate a .config looking like this.
cat .config
...
CONFIG_1=yCONFIG_2=y"

Making sure so we add a newline at the end of every config file that is
passed into the script.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
scripts/kconfig/merge_config.sh