kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-18 19:12:56 +00:00
Code Issues Releases Packages Activity
linux/scripts/kconfig
History
Anders Roxell 18576c701e scripts: kconfig: merge_config: config files: add a trailing newline 
[ Upstream commit 33330bcf03 ]

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>
History 2024-10-17 15:10:33 +02:00
..
lxdialog kconfig: lxdialog: A spello fix and a punctuation added 2021-04-14 15:22:49 +09:00
tests kconfig: change "modules" from sub-option to first-level attribute 2021-04-14 15:22:49 +09:00
.gitignore kconfig: refactor .gitignore 2021-04-26 02:17:39 +09:00
conf.c kconfig: constify long_opts 2021-06-05 23:49:46 +09:00
confdata.c kconfig: Update config changed flag before calling callback 2023-03-22 13:31:29 +01:00
expr.c kconfig: remove wrong expr_trans_bool() 2024-07-27 10:46:09 +02:00
expr.h kconfig: remove wrong expr_trans_bool() 2024-07-27 10:46:09 +02:00
gconf-cfg.sh kbuild: Allow kernel installation packaging to override pkg-config 2023-02-01 08:27:30 +01:00
gconf.c kconfig: gconf: give a proper initial state to the Save button 2024-07-27 10:46:09 +02:00
gconf.glade scripts/kconfig/gconf.glade Update broken web addresses. 2010-09-17 16:54:42 +02:00
images.c kconfig: constify XPM data 2020-08-14 13:30:03 +09:00
images.h kconfig: constify XPM data 2020-08-14 13:30:03 +09:00
internal.h kconfig: split menu.c out of parser.y 2021-04-14 15:26:09 +09:00
lexer.l kconfig: fix infinite loop when expanding a macro at the end of file 2024-03-26 18:21:34 -04:00
list.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
lkc.h kconfig: remove unused PACKAGE definition 2021-04-19 14:50:16 +09:00
lkc_proto.h kconfig: change sym_change_count to a boolean flag 2021-04-14 15:22:49 +09:00
Makefile kconfig: split menu.c out of parser.y 2021-04-14 15:26:09 +09:00
mconf-cfg.sh kbuild: Allow kernel installation packaging to override pkg-config 2023-02-01 08:27:30 +01:00
mconf.c kconfig: mconf,nconf: remove unneeded '\0' termination after snprintf() 2021-04-14 15:22:49 +09:00
menu.c kconfig: remove wrong expr_trans_bool() 2024-07-27 10:46:09 +02:00
merge_config.sh scripts: kconfig: merge_config: config files: add a trailing newline 2024-10-17 15:10:33 +02:00
nconf-cfg.sh kbuild: Allow kernel installation packaging to override pkg-config 2023-02-01 08:27:30 +01:00
nconf.c kconfig: nconf: stop endless search loops 2021-04-16 14:39:12 +09:00
nconf.gui.c kconfig: nconf: refactor in print_in_middle() 2021-04-14 15:25:43 +09:00
nconf.h kconfig: nconf: refactor in print_in_middle() 2021-04-14 15:25:43 +09:00
parser.y kconfig: split menu.c out of parser.y 2021-04-14 15:26:09 +09:00
preprocess.c kconfig: fix possible buffer overflow 2023-09-19 12:22:56 +02:00
qconf-cfg.sh kbuild: Allow kernel installation packaging to override pkg-config 2023-02-01 08:27:30 +01:00
qconf.cc kconfig: highlight xconfig 'comment' lines with '***' 2021-04-19 14:58:23 +09:00
qconf.h kconfig: qconf: remove Y, M, N columns 2020-09-25 00:37:13 +09:00
streamline_config.pl streamline_config.pl: add softtabstop=4 for vim users 2021-06-29 10:53:45 -07:00
symbol.c kconfig: fix comparison to constant symbols, 'm', 'n' 2024-06-16 13:39:51 +02:00
util.c kconfig: convert to SPDX License Identifier 2018-12-28 22:22:28 +09:00