Anders Roxell
71d7a71aec
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 >
(cherry picked from commit 6a130ec2f0646a8544308b6cf983269d5a2a7fa0)
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com >
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com >
2025-02-07 11:45:54 +00:00
..
2017-08-10 01:01:03 +09:00
2019-06-11 12:21:51 +02:00
2022-01-27 09:01:01 +01:00
2024-08-24 08:23:54 +00:00
2019-12-05 15:37:04 +01:00
2017-11-02 11:10:55 +01:00
2025-02-07 11:45:54 +00:00
2017-03-28 16:16:52 +02:00
2023-10-10 21:43:41 +02:00
2018-05-30 07:52:21 +02:00
2022-10-26 13:16:58 +02:00
2021-08-15 13:03:31 +02:00
2017-06-23 14:17:38 -06:00
2018-05-30 07:52:17 +02:00
2023-04-26 11:18:58 +02:00
2021-06-03 08:36:11 +02:00
2017-05-14 11:20:44 +09:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-02-03 11:49:06 +01:00
2020-12-29 13:47:02 +01:00
2019-06-25 11:36:53 +08:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-12-14 09:53:06 +01:00
2021-06-03 08:36:11 +02:00
2016-10-11 15:06:30 -07:00
2020-07-29 07:42:54 +02:00
2020-05-20 08:17:01 +02:00
2021-01-12 20:09:06 +01:00
2021-06-03 08:36:11 +02:00
2017-05-14 11:20:44 +09:00
2017-05-14 11:20:44 +09:00
2022-11-25 17:36:47 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2018-02-07 11:12:17 -08:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2024-10-10 10:27:56 +00:00
2024-10-10 10:27:56 +00:00
2017-07-07 15:09:09 -07:00
2017-05-14 11:20:44 +09:00
2017-08-08 11:09:31 -07:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-12-25 14:26:33 +01:00
2017-11-02 11:10:55 +01:00
2020-01-04 13:59:51 +01:00
2020-06-30 15:38:06 -04:00
2018-02-25 11:07:58 +01:00
2017-11-02 11:10:55 +01:00
2021-11-26 11:40:28 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2021-03-07 11:27:41 +01:00
2017-11-02 11:10:55 +01:00
2021-02-23 14:00:33 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2024-05-30 09:00:38 +00:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2018-02-16 20:23:04 +01:00
2018-03-15 10:54:33 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2022-09-05 10:25:06 +02:00
2017-11-02 11:10:55 +01:00
2023-09-23 10:46:52 +02:00
2017-11-02 11:10:55 +01:00
2017-05-14 11:20:44 +09:00
2021-07-28 11:12:15 +02:00
2017-11-02 11:10:55 +01:00
2022-09-28 10:56:49 +02:00
2017-11-02 11:10:55 +01:00
2017-03-13 09:40:28 -07:00
2019-10-29 09:16:59 +01:00
2017-03-11 11:13:38 +09:00
2020-04-02 16:34:15 +02:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2023-05-30 12:38:36 +01:00
2019-07-31 07:28:53 +02:00
2022-01-05 12:33:48 +01:00
2020-11-05 11:06:51 +01:00
2021-06-03 08:36:11 +02:00
2023-12-20 15:32:34 +01:00
2016-11-14 11:11:51 +11:00
2017-10-03 17:54:23 -07:00
2021-06-03 08:36:11 +02:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2023-08-11 11:33:32 +02:00
2018-12-08 13:03:35 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00