From nobody Tue Aug 09 21:59:03 2022 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 4M2RmR3KDbz4YHTF; Tue, 9 Aug 2022 21:59:03 +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 4M2RmR2qK5z42Cj; Tue, 9 Aug 2022 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082343; 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=YQczqI1aXzRGE4MFQB9agQshZoxd6U9AtYbUeoh2U60=; b=baGeokBXZXwQBuHAsC83jZv6BSyQQdI4TnbV0QqqGd5FJhIJ8RiwwBEF5meoYXU1vkzcrt Bxn1YepB77on5R+pxgXs5ahM2vdkVF/v3qwCwPkmwoewf15pa9c8sO5tIZe2twGBL79W1b w3DG/JMxCbnuc6VHmZ9fm/NxNwbXcNmXyK+3ubKn52lQG+GUXSlJtqDIFjBhhz6iVgkQLp VcwaeC0B/Vr1eTxj0MAJehe05ozU7XG9cVgjKZMl+wC40sGa8/nekBCfVNA3H10Q87H0DL AzRsQQ0PUdKRO9k3LGsIcFLQOe64WWtdwOsudzJfCX6fnshAEqFH7XZuAuBMyw== 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 4M2RmR1t6mznLK; Tue, 9 Aug 2022 21:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 279Lx3ZL086426; Tue, 9 Aug 2022 21:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279Lx30T086425; Tue, 9 Aug 2022 21:59:03 GMT (envelope-from git) Date: Tue, 9 Aug 2022 21:59:03 GMT Message-Id: <202208092159.279Lx30T086425@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: e9ba25aabf69 - main - release: Use in-tree etcupdate for build 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9ba25aabf6932646ddf0eb2144f40003349d921 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082343; 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=YQczqI1aXzRGE4MFQB9agQshZoxd6U9AtYbUeoh2U60=; b=QMkL6LHj1R+VDSkfMMDIGwZ8vfxqXvJXYrnY99/XdJNM9DJ6A1VlLkDH4i0RSPq+ED2gkg 5mjB1nXfxr6qINB/Z9qLg/j9UrvtSBDGOikQgKo2KSsCgrTQHgFgIwUPJxIoOb25HZZeFE lcE/CWal7FyF5QgPt7VWf4eDETL/qpp7JUEWjy4gxi1MCdrx9SkxOaKivFfS4uMIJZssMN ckLj2uowl8Vhq57Ss4yk7BEWdssjmcRu9VwkmzBU6Rt9KUOsHvFYffAuTV8khnigyFRw2J TPSPygfRNZm+xVuyda62+NVL/J76JjYLD14uhb4UNy54H/ijOmINSi5Y98D49A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660082343; a=rsa-sha256; cv=none; b=ZpcLAVYXWmcedOLbyK9dd2YR6nP1tw2S7xYHH1mmGPJIR/zRi6LLG1cf3FSxY3BFLxH8TU k+VcryDSw+FSCrWZR8wlEmhaWXYkMMZzlF2NMGSPWrNITAJJ1t3IPo7qHiulnoIU7Q/pye 1NSK82icMabBIZbCO2JbvzFqVjs6x7fxJTECUzqCptpSsdDKqAwXG/YFihvBBkoyYYRjzE UBXwE0UkTtLbcab8OjGTXRR5KCTsVUaNuVlj7iZKkmWFUkRk1Fx6J1XS7u2OzhFou3nZsh vk860NTur+NgFT8x+Y1iQiFX/pJ2kLb9AZU12fzk8hbjy8dy6tc/t7RgP9IlZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e9ba25aabf6932646ddf0eb2144f40003349d921 commit e9ba25aabf6932646ddf0eb2144f40003349d921 Author: Jessica Clarke AuthorDate: 2022-08-09 21:52:47 +0000 Commit: Jessica Clarke CommitDate: 2022-08-09 21:52:47 +0000 release: Use in-tree etcupdate for build This is in preparation for non-FreeBSD and -DNO_ROOT builds. On non-FreeBSD there is no host etcupdate to use, and -DNO_ROOT will require additional flags that may not be supported by the host's etcupdate when building on FreeBSD. Moreover, there's no guarantee anyway that the host's etcupdate is quite right for the current tree; upgrading from source only requires that the host's is good enough for -p which just manually copies master.passwd and group, the rest of the upgrade is done post-installworld. For example, should a new set of autogenerated files be added that etcupdate is taught about, the host won't know about them and so the bootstrapped current tree will incorrectly contain them, leading to spurious diffs on the installed system. Reviewed by: gjb, delphij Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35853 --- release/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 6f250e0fc9ca..c8639b43a3be 100644 --- a/release/Makefile +++ b/release/Makefile @@ -123,7 +123,8 @@ base.txz: sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \ "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \ -D "${.OBJDIR}/${DISTDIR}/base" - etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ + sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ + -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" .endif # Package all components