From nobody Fri Nov 10 10:06:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRZHM09p3z501DP; Fri, 10 Nov 2023 10:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRZHL6j6Dz3JT9; Fri, 10 Nov 2023 10:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyDeq4pzNV24RcNdaU9JNE2K3h7lf2AfBpM/yiUj+oE=; b=nXKCD62VaQIA0UIOKR83r4lkld9wc5TQEDzJgVN3uwabxP/NNyC3zZJQ6WPmzwK2rs6Sk4 BX01wFJWsQeSpWQsLW6KUg9zWHuFSn1+KBlpXvbkW4SJ4l0swAq+mXZj1koWSiGlaeudOY l3VaOOxwpPWrDU3BqBTWjBK//HyF1zwGNGHhKHRtRfDTd2LwVJA/HjgBGQFhLoMwhSo+3r 9N8dpX7sBHS2XKlrbeQmFsP1yBVFxfAQdatMi8eR4HoYnW+NMUR5eNihxa9ehsCK4+mE7X pxHL8ijAGJ3K//XKPaRzkPee/jroHZMZUVkykkj81c56Q+M1giz/up90SmI0Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699610814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyDeq4pzNV24RcNdaU9JNE2K3h7lf2AfBpM/yiUj+oE=; b=oecfV6eY6YmeRI8257gbbvaPxIbEUs4NdC0kYZC3K32/YY/tRCa2nir+/0/JItmFuXCx05 mVeFb6e/N1QkOnIlD1ct8Igri69AcBZT2rqUcCOBpfgyq1gxW7EFi+eH0cRZIVDQ9AkTB9 AkumJR0Sv+RtSWbZkP+94ffrk7iV51Y50n1NEiPff+CTZxWkEmi6eVwWinRuKnKrZMVESG qZKggVECEvA47LYF220oRWnvJDeYxpa0pExPAMRB1ftp73XoyTR3yVBUxVQobI3b4qKMDV fnkdf3V5WsnwNtabiwVCw6c14mdy6zbtVdIxbx9EbY2V+DEuEFAEoNscf+Oayw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699610814; a=rsa-sha256; cv=none; b=f8p8KOnYH2VZyMtsArmKWRFtAH09vS7vAFKrlcDJ8jwk7OMhAZg26FZlDaUTvXvRHt6H8E Sr6zg6ac8vArofZZyQP8LJS1JV/MjbefTKlZSavMfksbYZgB5EFl8XlIyWizgk2jtnece5 kspNKwoUvcHHDWYChKVsieKfgMnCl+Y2CgiPJELNOkTWTHKCgcYTTFItCDsonceT4P4Pnc 8S8umBg9YQ98MPiPXSlluTdDBmlwBP6RcLtzh1Bwp7EmxVUngkjQ30ZmtFeNsfAFKu0xQL c708LMhkq0p5rPSssmyR7bDPd6Ieq1fsayF7cUVBt0FyxB6A5tdCfB0i2Izgww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRZHL5lsqztfR; Fri, 10 Nov 2023 10:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAA6s97016578; Fri, 10 Nov 2023 10:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAA6sHU016575; Fri, 10 Nov 2023 10:06:54 GMT (envelope-from git) Date: Fri, 10 Nov 2023 10:06:54 GMT Message-Id: <202311101006.3AAA6sHU016575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 0b2001416752 - main - sys/conf: Move adding kernel.bin earlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b2001416752f2dc7b910b38bd398ef84cb263c2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0b2001416752f2dc7b910b38bd398ef84cb263c2 commit 0b2001416752f2dc7b910b38bd398ef84cb263c2 Author: Andrew Turner AuthorDate: 2023-11-09 16:37:27 +0000 Commit: Andrew Turner 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"