From nobody Thu Jul 27 04:12:05 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 4RBHQt2N6Hz4pQML; Thu, 27 Jul 2023 04:12:06 +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 4RBHQs5Jytz3nbf; Thu, 27 Jul 2023 04:12:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431125; 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=XjqJSGEbyNxNKWFcKZVbuyCCrgA9TO7HgZkn0M5E1Us=; b=mPK4Fo52XufPOaIjw2pviSQ/ibn5RgMxlo4sL/06jQAJeLms/9LTRxwhHzboSzn5I1wsE3 hbsmqKnj6rvUVmoXUqHDYE7wwPRsiL00cmNc8xnMCaJJ7PcwzLS43yygWv6KNAGlhlAecz 8KuVpZM8l2eE/P23UETi851LRTlasaI7xeciydGkBgWND7i7GvgPAeozZnxlM5GwYY2Wap YDQDdMo6jrrdWbPrD30cyEoIyCIyKZWfKXovP/UnS536j3nBc86T7FimEJZnOe8qjbt+M6 B4CbDhuarX5e1j4CxXZd2zlzaPbDF7itfxz/ZqqD33X2pUDWIXpzX7P+magBFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431125; 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=XjqJSGEbyNxNKWFcKZVbuyCCrgA9TO7HgZkn0M5E1Us=; b=oxs1yaPgwLBUYiPo7reW6Q9jZ2MQGCHrBfqkCbBFDC18G5kfcnXqbXvNPv7rZ+inQTvLLL Xf6yqBX3NA1FFMpubsoQ3QAMJR6YeO++b06paaHyDxdUGNB3MVe3dJYH9PAvdrGcieYvsF /HZ5Tk5kxy9p3wegDru1gtVCebtvBqx9adO7I9STeqZGxqq367QElsfPSURkUZ/Wvj2meN Y8YjH2iAKjapixHpRt+1AC2rGIwwRYrhpaPH2iNsNrV/7HAD5psOl3UculPdqZGZjdEzVY O80ijbgYa0Fp67k9/K742YFVdjkqQTSq8rPk7eeMSShaS+YbZPdcFun9aTdBKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431125; a=rsa-sha256; cv=none; b=LK6mMe263KfNFyJON4vNy8veEFcWtPTEFI/hT+xwbtvE5EnTh197leis8YCvAoamkE9RAT qWLv3FOBlgIrXLXGEDXUm5MjM2LzDd0j+BJImD4KCf24Fjkz5DzkxVeiVOohbzIE66IXzr VPoZm+lhFODgO1YrOjLH6dPR2BC8DlByemM5sept385Yark3+FyjjXK5AdSx6qT3zYppQv 23mBLzUllC2XgurCJwf4U4Y8r9teE5VNpMu95lKnlZ+xEur4gsa0d+ZRpx6MR8LvCLDLw7 /x5zTMXvO3UYAcNKN+L0Bji7HW7eOMLGhBDghc+4g6LEvYTfJesUG+mqgcpRUA== 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 4RBHQs4Kq1z191Q; Thu, 27 Jul 2023 04:12:05 +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 36R4C5ix097723; Thu, 27 Jul 2023 04:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4C5S4097722; Thu, 27 Jul 2023 04:12:05 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:12:05 GMT Message-Id: <202307270412.36R4C5S4097722@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: d81da4c98328 - main - Makefile.inc1: Add new buildetc and installetc 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: d81da4c98328d4ee3fe4c0a85f6874a3c69a1afd Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d81da4c98328d4ee3fe4c0a85f6874a3c69a1afd commit d81da4c98328d4ee3fe4c0a85f6874a3c69a1afd Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:49 +0000 Commit: Jessica Clarke CommitDate: 2023-07-27 04:10:49 +0000 Makefile.inc1: Add new buildetc and installetc targets These implement the steps that etcupdate (and mergemaster) need in order to build their pristine trees, avoiding the need to use internal targets and variables. Additionally, buildetc includes the steps needed to build with BUILD_WITH_STRICT_TMPPATH enabled, since we need some host tools to be available during the various build and install steps. Reviewed by: jhb, imp Differential Revision: https://reviews.freebsd.org/D41205 --- Makefile | 4 ++-- Makefile.inc1 | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3bc3d1f96aa..699f003bf7df 100644 --- a/Makefile +++ b/Makefile @@ -158,14 +158,14 @@ __DO_KERNELS?=yes .include "${.CURDIR}/share/mk/bsd.compat.pre.mk" -TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ +TGTS= all all-man buildenv buildenvvars buildetc buildkernel buildworld \ check check-old check-old-dirs check-old-files check-old-libs \ checkdpadd checkworld clean cleandepend cleandir cleankernel \ cleanworld cleanuniverse \ delete-old delete-old-dirs delete-old-files delete-old-libs \ depend distribute distributekernel distributekernel.debug \ distributeworld distrib-dirs distribution doxygen \ - everything hier hierarchy install installcheck installkernel \ + everything hier hierarchy install installcheck installetc installkernel \ installkernel.debug packagekernel packageworld \ reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries maninstall \ diff --git a/Makefile.inc1 b/Makefile.inc1 index aa65711fbc0b..f8d4b4333d99 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1623,6 +1623,29 @@ distrib-dirs distribution: .MAKE .PHONY MK_TESTS_SUPPORT=${MK_TESTS_SUPPORT} installconfig .endif +# +# buildetc and installetc +# +buildetc: .MAKE .PHONY + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _worldtmp + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _legacy + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _bootstrap-tools \ + MK_CROSS_COMPILER=no MK_TOOLCHAIN=no + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _obj \ + SUBDIR_OVERRIDE=etc + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 everything \ + SUBDIR_OVERRIDE=etc + +installetc: .MAKE .PHONY + @echo "--------------------------------------------------------------" + @echo ">>> Making hierarchy" + @echo "--------------------------------------------------------------" + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distrib-dirs + @echo "--------------------------------------------------------------" + @echo ">>> Making distribution" + @echo "--------------------------------------------------------------" + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribution + # # buildkernel and installkernel #