Once converted this script needs to match what the Makefiles have.
Signed-off-by: Elliott Mitchell <ehem+linux@xxxxxxx>
---
With this, the new approach is pretty well functioning.
---
scripts/link-vmlinux.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 7862a8101747..d98a1494655a 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -87,7 +87,7 @@ vmlinux_link()
ldlibs=
fi
- ldflags="${ldflags} ${wl}--script=${objtree}/${KBUILD_LDS}"
+ ldflags="${ldflags} ${wl}--script=${objtree}${KBUILD_LDS}"
# The kallsyms linking does not need debug symbols included.
if [ "$output" != "${output#.tmp_vmlinux.kallsyms}" ] ; then
@@ -193,12 +193,12 @@ kallsyms_step()
mksysmap()
{
info NM ${2}
- ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2} ${3}
+ ${CONFIG_SHELL} "${srctree}scripts/mksysmap" ${1} ${2} ${3}
}
sorttable()
{
- ${objtree}/scripts/sorttable ${1}
+ ${objtree}scripts/sorttable ${1}
}
# Delete output files in case of error
@@ -222,7 +222,7 @@ if [ "$1" = "clean" ]; then
exit 0
fi
-${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init init/version-timestamp.o
+${MAKE} -f "${srctree}scripts/Makefile.build" obj=init init/version-timestamp.o
btf_vmlinux_bin_o=""
if is_enabled CONFIG_DEBUG_INFO_BTF; then
@@ -266,8 +266,8 @@ if is_enabled CONFIG_KALLSYMS; then
kallsyms_step 2
# step 3
- size1=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso_prev})
- size2=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso})
+ size1=$(${CONFIG_SHELL} "${srctree}scripts/file-size.sh" ${kallsymso_prev})
+ size2=$(${CONFIG_SHELL} "${srctree}scripts/file-size.sh" ${kallsymso})
if [ $size1 -ne $size2 ] || [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
kallsyms_step 3
--
2.39.2
