]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
kbuild: explicitly run mksysmap as sed script from link-vmlinux.sh
authorRichard Acayan <mailingradian@gmail.com>
Wed, 5 Jun 2024 17:58:09 +0000 (13:58 -0400)
committerMasahiro Yamada <masahiroy@kernel.org>
Thu, 6 Jun 2024 23:42:14 +0000 (08:42 +0900)
In commit b18b047002b7 ("kbuild: change scripts/mksysmap into sed
script"), the mksysmap script was transformed into a sed script,
made directly executable with "#!/bin/sed -f". Apparently, the path to
sed is different on NixOS.

The shebang can't use the env command, otherwise the "sed -f" command
would be treated as a single argument. This can be solved with the -S
flag, but that is a GNU extension. Explicitly use sed instead of relying
on the executable shebang to fix NixOS builds without breaking build
environments using Busybox.

Fixes: b18b047002b7 ("kbuild: change scripts/mksysmap into sed script")
Reported-by: Kent Overstreet <kent.overstreet@linux.dev>
Signed-off-by: Richard Acayan <mailingradian@gmail.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Dmitry Safonov <0x7f454c46@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
scripts/link-vmlinux.sh

index 46ce5d04dbeb100ddbe524baa36ccd63415e8738..518c70b8db5078715be6f142f6103a714b6d3063 100755 (executable)
@@ -193,7 +193,7 @@ kallsyms_step()
 mksysmap()
 {
        info NM ${2}
-       ${NM} -n "${1}" | "${srctree}/scripts/mksysmap" > "${2}"
+       ${NM} -n "${1}" | sed -f "${srctree}/scripts/mksysmap" > "${2}"
 }
 
 sorttable()