From nobody Wed Dec 13 21:44:19 2023 X-Original-To: dev-commits-src-main@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 4Sr8Br0KZZz54MYN; Wed, 13 Dec 2023 21:44:20 +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 4Sr8Bq6QFrz3Mxx; Wed, 13 Dec 2023 21:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702503859; 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=DfsXkgz6HhljlPNJVjNKfElitWsYj2SU0n4DhgEi1LM=; b=K88PsWR610pSP/JYeNwB07VlfG/GimCdZOTDk8O/OetJeiVG0DlOHK2qKzvxffyLjC2zHr PtXMgtZuYGUd3YwXpe53eb/16FngoJ2XVCWullm8e6lRKxvzJ3pMdIBBRFDgPl7QsAkOJg By328kQD2zhPaZ707BC2l4HhZWTrLF/qV1rTRS/IRsqlPeHecNF0wwNgFB5Th/pVzh+b8B zSY1JZojm2KqA55B3goADoHjCg1TnKpxEg2UI7Vu9ztLQ0zozl1FwqWg7s0MaJArbDjiP7 Rpfuz8l5QcpbuLhXStVT4zmAx1WMPvibU0JBIrgd/NNlVJ8MqmZD4dEKg+HJmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702503859; a=rsa-sha256; cv=none; b=kztvTrcD9SkfkIelK1e7IwCVsGv6ukMTVgpuaWNqdqpR9vDpSvmgYWaVmMH2wofkiim/WA lufm3qeQMFDtrQ/1qyYtIPdcrmHiW4bWkPIG2S4KGaCEEvzu6jOrmo6fehfmxr6SGOFsaX 9ThDLRvSDiO+qfb7G5fKqUMHyA22j1qRPSX76Dz2BkNcrmN+9UbjcQg0iOmkwhIIsd5RrY X04CmuPqhPG11fblc6WTVO+nUFIPPjMzJ8KI6mdn+L7bxw59Q670BOW4gHsJTXc8+xptG7 5yX8ARLP7MEgEzno2JWKT4Vvoqb4ctEAxqAPKUed4oL+MOz55MdQXU8j5mAn/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702503859; 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=DfsXkgz6HhljlPNJVjNKfElitWsYj2SU0n4DhgEi1LM=; b=J5hoJSuCgInrcpadCUWWaMXLa2liA+c0lQGv5gpJDxkRqbPAVKJdILlAp16IlQFjRnGbKP rqqR7mXYCdbEjSf27MwqN78VgtyXM5nj3Egl/XX5qWM7EG/a/rQoawDii1Ve56Ob8PoEdy b8dWhAJKCU7FE12ytQo7rvSFTcsdBV94/JjAvKYHxM1ikR6EfxPUOOqxTVyzsX3x+lksF5 OBdKJ+zRF+wvZPjmtuOMoSbXeaK6S/i2cCjM9wsGwQJLPJXDiTj5PB3XuuycMamrxwCCKK 5OctdF+fikiqmVcsXvcB7CI8CRT1sTcfSVKyIdWtiIRQgdesz5TvKaPpP+tfNQ== 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 4Sr8Bq54zdz1FWR; Wed, 13 Dec 2023 21:44:19 +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 3BDLiJkW056011; Wed, 13 Dec 2023 21:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDLiJaq056008; Wed, 13 Dec 2023 21:44:19 GMT (envelope-from git) Date: Wed, 13 Dec 2023 21:44:19 GMT Message-Id: <202312132144.3BDLiJaq056008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: e131d3f4f34f - main - Makefile.inc1: Forward on METALOG and DISTBASE for kernel targets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e131d3f4f34fdbce465524f7b1093f01acc9de7c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e131d3f4f34fdbce465524f7b1093f01acc9de7c commit e131d3f4f34fdbce465524f7b1093f01acc9de7c Author: Jessica Clarke AuthorDate: 2023-12-13 21:43:09 +0000 Commit: Jessica Clarke CommitDate: 2023-12-13 21:43:09 +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 --- Makefile.inc1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3d982e45fd63..7b5e7e048a72 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1837,7 +1837,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 "--------------------------------------------------------------" @@ -1849,7 +1850,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 "--------------------------------------------------------------" @@ -1869,7 +1871,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 > \ @@ -1885,7 +1888,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}|.|" \