]> 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>
Thu, 17 Oct 2024 13:10:33 +0000 (15:10 +0200)
commit18576c701e8596449d3e8ab181767c2ea66206a3
treed3d3c3d74268d00616478a81a9da6b3d373dfb80
parent7d91a0b2151a9c3b61d44c85c8eba930eddd1dd0
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