Anders Roxell
af8151c833
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>
2024-11-08 16:20:24 +01:00
..
lxdialog
kconfig: remove trailing whitespaces
2019-05-09 22:37:17 +09:00
tests
docs: kbuild: convert docs to ReST and rename to *.rst
2019-06-14 14:21:21 -06:00
.gitignore
kconfig: rename generated .*conf-cfg to *conf-cfg
2019-01-06 10:47:09 +09:00
conf.c
kconfig: Fix spelling of sym_is_changable
2019-07-06 21:58:23 +09:00
confdata.c
kconfig: fix failing to generate auto.conf
2022-02-23 12:00:01 +01:00
expr.c
kconfig: remove wrong expr_trans_bool()
2024-07-27 10:38:29 +02:00
expr.h
kconfig: remove wrong expr_trans_bool()
2024-07-27 10:38:29 +02:00
gconf-cfg.sh
gconf.c
kconfig: gconf: give a proper initial state to the Save button
2024-07-27 10:38:29 +02:00
gconf.glade
images.c
kconfig: split images.c out of qconf.cc/gconf.c to fix gconf warnings
2018-12-28 22:22:39 +09:00
images.h
kconfig: split images.c out of qconf.cc/gconf.c to fix gconf warnings
2018-12-28 22:22:39 +09:00
lexer.l
kconfig: fix infinite loop when expanding a macro at the end of file
2024-03-26 18:22:24 -04:00
list.h
lkc.h
kconfig: require the argument of --defconfig
2019-06-09 15:08:18 +09:00
lkc_proto.h
kconfig: Fix spelling of sym_is_changable
2019-07-06 21:58:23 +09:00
Makefile
kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
2019-09-04 23:12:50 +09:00
mconf-cfg.sh
mconf.c
kconfig: Fix spelling of sym_is_changable
2019-07-06 21:58:23 +09:00
menu.c
kconfig: remove wrong expr_trans_bool()
2024-07-27 10:38:29 +02:00
merge_config.sh
scripts: kconfig: merge_config: config files: add a trailing newline
2024-11-08 16:20:24 +01:00
nconf-cfg.sh
kconfig: Make nconf-cfg.sh executable
2019-04-09 22:44:57 +09:00
nconf.c
kconfig: nconf: stop endless search loops
2021-05-19 10:08:23 +02:00
nconf.gui.c
kconfig/[mn]conf: handle backspace (^H) key
2019-03-29 22:48:01 +09:00
nconf.h
kconfig: convert to SPDX License Identifier
2018-12-28 22:22:28 +09:00
parser.y
kconfig: rename zconf.y to parser.y
2019-02-13 23:25:58 +09:00
preprocess.c
kconfig: fix possible buffer overflow
2023-09-23 10:59:57 +02:00
qconf-cfg.sh
qconf.cc
kconfig: qconf: fix signal connection to invalid slots
2020-08-26 10:41:04 +02:00
qconf.h
kconfig: fix 'Save As' menu of xconfig
2019-03-12 02:50:24 +09:00
streamline_config.pl
kconfig: convert to SPDX License Identifier
2018-12-28 22:22:28 +09:00
symbol.c
kconfig: fix comparison to constant symbols, 'm', 'n'
2024-06-16 13:28:47 +02:00
util.c
kconfig: convert to SPDX License Identifier
2018-12-28 22:22:28 +09:00