Date: Fri, 10 Nov 2023 10:06:54 GMT From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0b2001416752 - main - sys/conf: Move adding kernel.bin earlier Message-ID: <202311101006.3AAA6sHU016575@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0b2001416752f2dc7b910b38bd398ef84cb263c2 commit 0b2001416752f2dc7b910b38bd398ef84cb263c2 Author: Andrew Turner <andrew@FreeBSD.org> AuthorDate: 2023-11-09 16:37:27 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> CommitDate: 2023-11-10 09:57:44 +0000 sys/conf: Move adding kernel.bin earlier When building with kernel.bin enabled we need to set KERNEL_EXTRA and KERNEL_EXTRA_INSTALL before they are used otherwise kernel.bin isn't built. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42531 --- sys/conf/kern.post.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 5258cea9441c..cb34ebc36295 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -141,6 +141,15 @@ ports-${__target}: .endfor .endif +# Generate the .bin (booti images) kernel as an extra build output. +# The targets and rules to generate these appear in Makefile.$MACHINE +# if the platform supports it. +.if ${MK_KERNEL_BIN} != "no" +KERNEL_EXTRA+= ${KERNEL_KO}.bin +KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin +CLEAN+= ${KERNEL_KO}.bin +.endif + .ORDER: kernel-install modules-install beforebuild: .PHONY @@ -466,13 +475,4 @@ embedfs_${MFS_IMAGE:T:R}.o: ${MFS_IMAGE} $S/dev/md/embedfs.S .endif .endif -# Generate the .bin (booti images) kernel as an extra build output. -# The targets and rules to generate these appear in Makefile.$MACHINE -# if the platform supports it. -.if ${MK_KERNEL_BIN} != "no" -KERNEL_EXTRA+= ${KERNEL_KO}.bin -KERNEL_EXTRA_INSTALL+= ${KERNEL_KO}.bin -CLEAN+= ${KERNEL_KO}.bin -.endif - .include "kern.mk"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311101006.3AAA6sHU016575>