From nobody Thu Jan 18 22:31:44 2024 X-Original-To: dev-commits-src-branches@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 4TGHXx2t7vz57962; Thu, 18 Jan 2024 22:31:45 +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 4TGHXx09Kpz4CTn; Thu, 18 Jan 2024 22:31:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617105; 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=o8kgJpTnyTOeX81mIex5gqQ7/mpfOusJKW0Biqs25iI=; b=mG9Km/xD5RdJtUla2PHXo2mnvNxEvhokli7IoJjAvshZeh2WRKNoIKn1SLHEj9HCNxS7Xg tDL2Ijg3ykm0AiY5FbCwVdXApB0LfUYBNtGlw1nz69gjc55j1vDqoTcUmoK7LKFGC1JPvm V/DlvZV2clEi4inRqy+U5j+Sj2nLLzFfl5McJa5gf0dHb4rrkms0Eso+4cEDIkq2PAAlzc Ko0yl8SPxlvsJZqAbw5iQcLFlGSVv7MRmrq6/C9a8kAbvomBHiBlGjA5hftgFPVFUJZP6C zmyPg15HIEokXwIxFMs7gt2B76gy+GJgr0jyhUSpEGTNOitSCAS7TOcoUXKSFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617105; 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=o8kgJpTnyTOeX81mIex5gqQ7/mpfOusJKW0Biqs25iI=; b=T65KWuT3yyINE4PsTgFh6sFwKcPMqV4+W6pBjPfl9PjxXlu13U3S1kW5q6ES+3QB5yoEt7 zPGanJ5fSux9cTg/l156OmQxapgvABSnJlp1oClne/qQTXMLpWNh5iDNL8u1dJp39uas08 fpzsH4HrI5y9P8jg5ZIztasCz+nqJET3vVbGcAx6Pq/dO8tvEz7pYOZKbWeruB2YOrvbdF +UblOQgV6GdOZFDN1WS18oqc3a0IONUI5/iNqJ2iCMUnEvJ3o+lkuO7nYgf4CKlMUcmafM TwTHJXmeHcrr7UugbY5+XahC+JIInWSib9be/pqwwRzcNkKyS0lU+XexfatAmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705617105; a=rsa-sha256; cv=none; b=QuynoyFMmfciA7PNVT9dMJnyWjPh30oCj30I6dIGb1yGgHxe9NoI+nMC5OfDlvJaKUkUYv NAgwUna0SYp6z7luOmuM7+q9Vdp8+Yv3UraLqisAAND2E9n06DHiL+/dY3ZeSVjis/E4/u QO41u0scEwUVU1wUZ4TASnHq81RbX5Jj3QLKFuzgmbrZlZTdafSgQrhaDfMmSg1QcceI/6 5n6fAkQQpnE9WToJvjMSA69ymAEY5B4tGvKBCp2xtz9CL1+ghXAx6Uhak2eSSaDb/pa/kl WSpctg1aYwxiZXbpREbhHfpVuzkloAezViE8ibIUqiMcLqnqXZgDI0O76T9GJw== 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 4TGHXw6M4GzQWJ; Thu, 18 Jan 2024 22:31:44 +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 40IMVikv005253; Thu, 18 Jan 2024 22:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMVifC005250; Thu, 18 Jan 2024 22:31:44 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:31:44 GMT Message-Id: <202401182231.40IMVifC005250@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 509a5d9314d1 - stable/14 - Makefile.inc1: Forward on METALOG and DISTBASE for kernel targets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 509a5d9314d1f4af64d9f7c8a5e93f6efc50dca8 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=509a5d9314d1f4af64d9f7c8a5e93f6efc50dca8 commit 509a5d9314d1f4af64d9f7c8a5e93f6efc50dca8 Author: Jessica Clarke AuthorDate: 2023-12-13 21:43:09 +0000 Commit: John Baldwin CommitDate: 2024-01-18 22:29:19 +0000 Makefile.inc1: Forward on METALOG and DISTBASE for kernel targets Currently IMAKE_INSTALL, which includes -M METALOG, is enough for the sub-makes to work, but using kldxref for -DNO_ROOT builds will require manually adding linker.hints to the METALOG, and thus both METALOG itself and DISTBASE need to be exposed directly to the sub-makes, so do so. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D43050 (cherry picked from commit e131d3f4f34fdbce465524f7b1093f01acc9de7c) --- Makefile.inc1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 5b130d9c3271..857aed8e703c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1838,7 +1838,8 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY @echo "--------------------------------------------------------------" ${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH:Q} \ - ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} + ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} METALOG=${METALOG} \ + ${.TARGET:S/kernel//} @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${INSTALLKERNEL} completed on $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" @@ -1850,7 +1851,8 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel .PHONY @echo "--------------------------------------------------------------" ${_+_}cd ${KRNLOBJDIR}/${_kernel}; \ ${CROSSENV} PATH=${TMPPATH:Q} \ - ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} ${.TARGET:S/kernel//} + ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME}.${_kernel} METALOG=${METALOG} \ + ${.TARGET:S/kernel//} @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${_kernel} completed on $$(LC_ALL=C date)" @echo "--------------------------------------------------------------" @@ -1870,7 +1872,8 @@ distributekernel distributekernel.debug: .PHONY ${_+_}cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \ ${IMAKE_MTREE} PATH=${TMPPATH:Q} ${MAKE} KERNEL=${INSTKERNNAME} \ - DESTDIR=${INSTALL_DDIR}/kernel \ + DISTBASE=/kernel DESTDIR=${INSTALL_DDIR}/kernel \ + METALOG=${METALOG:S/METALOG/kernel.premeta/} \ ${.TARGET:S/distributekernel/install/} .if defined(NO_ROOT) @sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \ @@ -1886,7 +1889,8 @@ distributekernel distributekernel.debug: .PHONY ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \ ${IMAKE_MTREE} PATH=${TMPPATH:Q} ${MAKE} \ KERNEL=${INSTKERNNAME}.${_kernel} \ - DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ + DISTBASE=/kernel.${_kernel} DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ + METALOG=${METALOG:S/METALOG/kernel.${_kernel}.premeta/} \ ${.TARGET:S/distributekernel/install/} .if defined(NO_ROOT) @sed -e "s|^./kernel.${_kernel}|.|" \