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
locking/atomics: Use sed(1) instead of non-standard head(1) option
2019-06-25 10:17:07 +02:00
kbuild: remove unneeded comments and code from scripts/basic/Makefile
2019-08-29 23:54:29 +09:00
scripts: add dummy report mode to add_namespace.cocci
2020-08-11 15:33:35 +02:00
scripts/dtc: dtx_diff: remove broken example from help text
2022-01-27 09:19:55 +01:00
gcc-plugins: Rename last_stmt() for GCC 14+
2024-07-27 10:38:28 +02:00
scripts/gdb: fix lx-timerlist for Python3
2023-05-17 11:35:55 +02:00
genksyms: convert to SPDX License Identifier for lex.l and parse.y
2019-09-14 11:40:13 +09:00
scripts: kconfig: merge_config: config files: add a trailing newline
2024-11-08 16:20:24 +01:00
modpost: fix tee MODULE_DEVICE_TABLE built on big-endian host
2023-11-20 10:30:14 +01:00
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
2020-09-03 11:27:10 +02:00
selinux: use "grep -E" instead of "egrep"
2022-10-26 13:22:21 +02:00
ftrace/scripts: Update the instructions for ftrace-bisect.sh
2023-02-06 07:52:44 +01:00
kbuild: remove the first line of *.mod files
2019-07-18 02:19:31 +09:00
ASN.1: Fix check for strdup() success
2023-04-26 11:24:06 +02:00
scripts: switch explicitly to Python 3
2021-05-22 11:38:30 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 391
2019-06-05 17:37:11 +02:00
scripts/bpf: Fix xdp_md forward declaration typo
2024-03-01 13:13:38 +01:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
checkpatch: fix unescaped left brace
2020-12-30 11:51:27 +01:00
scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
2019-06-05 02:33:10 +09:00
kbuild: update comment block of scripts/clang-version.sh
2019-03-04 22:34:54 +09:00
tweewide: Fix most Shebang lines
2021-05-22 11:38:30 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 54
2019-05-24 17:36:42 +02:00
scripts/decode_stacktrace: strip basepath from all paths
2020-07-29 10:18:35 +02:00
scripts/decodecode: fix trapping instruction formatting
2020-05-14 07:58:29 +02:00
depmod: handle the case of /sbin/depmod without /sbin in PATH
2021-01-12 20:16:10 +01:00
scripts: switch explicitly to Python 3
2021-05-22 11:38:30 +02:00
scripts/documentation-file-ref-check: ignore output dir
2019-06-14 14:43:01 -06:00
modpost: move the namespace field in Module.symvers last
2020-03-25 08:25:55 +01:00
cert host tools: Stop complaining about deprecated OpenSSL functions
2022-11-25 17:42:10 +01:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 339
2019-06-05 17:37:07 +02:00
scripts/faddr2line: Fix regression in name resolution on ppc64le
2022-12-08 11:23:02 +01:00
scripts/find-unused-docs: Fix massive false positives
2020-02-11 04:35:23 -08:00
kbuild: clean up scripts/gcc-version.sh
2019-03-04 22:35:04 +09:00
kbuild: Fix '-S -c' in x86 stack protector scripts
2024-08-19 05:33:53 +02:00
kbuild: Fix '-S -c' in x86 stack protector scripts
2024-08-19 05:33:53 +02:00
gen_compile_commands: lower the entry count threshold
2019-07-27 12:18:19 +09:00
kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y
2021-09-22 12:26:26 +02:00
tweewide: Fix most Shebang lines
2021-05-22 11:38:30 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61
2019-05-24 17:36:45 +02:00
get_maintainer: add ability to skip moderated mailing lists
2019-07-16 19:23:22 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 166
2019-05-30 11:26:39 -07:00
scripts: headers_install: Exit with error on config leak
2020-06-24 17:50:33 +02:00
scripts/kallsyms: fix definitely-lost memory leak
2020-01-04 19:18:23 +01:00
kbuild: remove the target in signal traps when interrupted
2022-10-26 13:22:46 +02:00
kconfig: introduce m32-flag and m64-flag
2020-04-08 09:08:37 +02:00
kernel-doc: Allow anonymous enum
2019-08-12 15:00:37 -06:00
leaking_addresses: Always print a trailing newline
2021-11-17 09:48:31 +01:00
kbuild: Fix changing ELF file type for output of gen_btf for big endian
2024-02-23 08:25:10 +01:00
scripts: set proper OpenSSL include dir also for sign-file
2021-02-26 10:10:27 +01:00
kbuild: force all architectures except um to include mandatory-y
2019-03-17 12:56:32 +09:00
kbuild: Fix objtool dependency for 'OBJECT_FILES_NON_STANDARD_<obj> := n'
2021-07-14 16:53:20 +02:00
kbuild: clean up subdir-ymn calculation in Makefile.clean
2019-08-29 23:54:29 +09:00
kbuild: Move -Wenum-{compare-conditional,enum-conversion} into W=1
2024-04-13 12:51:26 +02:00
gcc-plugins: Undefine LATENT_ENTROPY_PLUGIN when plugin disabled for a file
2022-08-25 11:18:31 +02:00
kbuild: move headers_check rule to usr/include/Makefile
2020-03-05 16:43:47 +01:00
kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
2019-09-04 23:12:50 +09:00
kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE
2019-08-15 13:24:04 +01:00
treewide: Add SPDX license identifier - Makefile/Kconfig
2019-05-21 10:50:46 +02:00
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
2020-09-03 11:27:10 +02:00
kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin}
2019-07-17 22:39:27 +09:00
kbuild: move modkern_{c,a}flags to Makefile.lib from Makefile.build
2019-08-22 01:14:11 +09:00
kbuild: modinst: read modules.order instead of $(MODVERDIR)/*.mod
2019-07-17 22:39:27 +09:00
kbuild: Fix include path in scripts/Makefile.modpost
2022-09-05 10:27:45 +02:00
kbuild: modsign: read modules.order instead of $(MODVERDIR)/*.mod
2019-07-17 22:39:27 +09:00
kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables
2020-09-03 11:27:10 +02:00
ubsan: Remove vla bound checks.
2019-05-06 11:12:09 -07:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 373
2019-06-05 17:37:10 +02:00
kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
2021-07-25 14:35:12 +02:00
kbuild: get rid of $(realpath ...) from scripts/mkmakefile
2019-08-29 23:54:29 +09:00
mksysmap: Fix the mismatch of 'L0' symbols in System.map
2022-09-28 11:03:59 +02:00
kbuild: get rid of kernel/ prefix from in-tree modules.{order,builtin}
2019-07-17 22:39:27 +09:00
namespace: fix namespace.pl script to support relative paths
2019-10-05 15:29:49 +09:00
scripts: add dummy report mode to add_namespace.cocci
2020-08-11 15:33:35 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 199
2019-05-30 11:29:23 -07:00
parse-maintainers: Mark as executable
2020-03-25 08:25:49 +01:00
recordmcount: Fix memory leaks in the uwrite function
2023-05-30 12:44:04 +01:00
recordmcount: Correct st_shndx handling
2021-06-30 08:47:49 -04:00
recordmcount.pl: fix typo in s390 mcount regex
2022-01-05 12:37:44 +01:00
scripts/setlocalversion: make git describe output more reliable
2020-11-01 12:01:01 +01:00
tweewide: Fix most Shebang lines
2021-05-22 11:38:30 +02:00
sign-file: Fix incorrect return values check
2023-12-20 15:41:17 +01:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 378
2019-06-05 17:37:10 +02:00
spdxcheck.py: fix directory structures
2019-06-01 15:51:31 -07:00
scripts/spelling.txt: add more spellings to spelling.txt
2019-07-12 11:05:41 -07:00
tweewide: Fix most Shebang lines
2021-05-22 11:38:30 +02:00
tweewide: Fix most Shebang lines
2021-05-22 11:38:30 +02:00
scripts/tags.sh: Resolve gtags empty index generation
2023-07-27 08:37:03 +02:00
Makefile: fix GDB warning with CONFIG_RELR
2021-07-14 16:53:12 +02:00
kbuild: add variables for compression tools
2020-09-03 11:27:10 +02:00
af8151c833