git: fb5ff7384cfd - main - arm64: Use FULLKERNEL instead of .ALLSRC in .bin target
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Apr 2023 15:42:31 UTC
The branch main has been updated by stevek:
URL: https://cgit.FreeBSD.org/src/commit/?id=fb5ff7384cfdf48bd850eb9d6691c19f9139698f
commit fb5ff7384cfdf48bd850eb9d6691c19f9139698f
Author: Steve Kiernan <stevek@juniper.net>
AuthorDate: 2023-01-20 02:07:38 +0000
Commit: Stephen J. Kiernan <stevek@FreeBSD.org>
CommitDate: 2023-04-18 15:41:57 +0000
arm64: Use FULLKERNEL instead of .ALLSRC in .bin target
Using .ALLSRC may get additional arguments that we may not want
and could cause the objcopy to fail.
Reviewed by: emaste
Obtained from: Juniper Networks, Inc.
Differential Revision: https://reviews.freebsd.org/D39639
---
sys/conf/Makefile.arm64 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/conf/Makefile.arm64 b/sys/conf/Makefile.arm64
index cda063466116..6719404c3291 100644
--- a/sys/conf/Makefile.arm64
+++ b/sys/conf/Makefile.arm64
@@ -93,8 +93,8 @@ CLEAN+= ${KERNEL_KO}.bin
# and the temp file together to make the kernel.bin file.
${KERNEL_KO}.bin: ${FULLKERNEL}
@${OBJCOPY} --wildcard --strip-symbol='$$[adtx]*' \
- --output-target=binary ${.ALLSRC} ${.TARGET}.temp
- @{ ${NM} ${.ALLSRC} | \
+ --output-target=binary ${FULLKERNEL} ${.TARGET}.temp
+ @{ ${NM} ${FULLKERNEL} | \
${AWK} -f $S/tools/arm_kernel_boothdr.awk -v hdrtype=v8booti && \
cat ${.TARGET}.temp; \
} > ${.TARGET}