e45e7fce9f
[ 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> |
||
---|---|---|
.. | ||
lxdialog | ||
tests | ||
conf.c | ||
confdata.c | ||
expr.c | ||
expr.h | ||
gconf-cfg.sh | ||
gconf.c | ||
gconf.glade | ||
images.c | ||
images.h | ||
lexer.l | ||
list.h | ||
lkc.h | ||
lkc_proto.h | ||
Makefile | ||
mconf-cfg.sh | ||
mconf.c | ||
menu.c | ||
merge_config.sh | ||
nconf-cfg.sh | ||
nconf.c | ||
nconf.gui.c | ||
nconf.h | ||
parser.y | ||
preprocess.c | ||
qconf-cfg.sh | ||
qconf.cc | ||
qconf.h | ||
streamline_config.pl | ||
symbol.c | ||
util.c |