From nobody Fri Jul 15 22:18:02 2022 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 4Ll5Mt336zz4Wn7M; Fri, 15 Jul 2022 22:18:02 +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 4Ll5Mt2S3Rz41gF; Fri, 15 Jul 2022 22:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657923482; 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=M2bsHRSh3q1qZnsVDSnDFFvnh/pcta4pmdJ5HRG/zbw=; b=YdErz9sQisVaL1K1lXfhMP7lPhX9BXjiAoAPepsuB3OVRqZAsPQG47RvP2dyFc0EHiw7yQ b+BXRWEOjaT+DU+y7WJL7MoPQxiWrOv7KkSSuBQFx35xhH7uWXht+as1gnTXLt4Gk25IXo Tf50qKvsctlgF2uuZpe/1E1IXDXWCoYryS3sKTMdW+kXlDu4Md1mwNFFPHgSuh7+jxp9tB 12dLjZhBAvz/EspmfegVvzKWfJlJtHLWZt6D+BUbmhryJStpJvQ5UwmuhL3gW8cdFploPS rMdv5Iw+W+9fBpt4nPhRDSzAGOGYb6xKWufUgUVC238KLXsA4GWDep2PPkRrJw== 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 4Ll5Mt165vzy8H; Fri, 15 Jul 2022 22:18:02 +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 26FMI2GT099856; Fri, 15 Jul 2022 22:18:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FMI2E6099855; Fri, 15 Jul 2022 22:18:02 GMT (envelope-from git) Date: Fri, 15 Jul 2022 22:18:02 GMT Message-Id: <202207152218.26FMI2E6099855@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: 445421abc914 - main - Makefile.inc1: Honour DB_FROM_SRC for NO_ROOT distributeworld 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: 445421abc914536d6c36327a5dd1d1cd71e55a15 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657923482; 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=M2bsHRSh3q1qZnsVDSnDFFvnh/pcta4pmdJ5HRG/zbw=; b=Ow0VAM+cHzpAPUcCBAchtWtiIBjLmL/cfqTjD6ZdH4+ytoMgh6RjRqiCnjKbVgJhIQCzVO f+n4y5zksHQPE9v7nwzOGVQOWUdaHDvG15eEAYAzVE3c9sTYMgecmEGYCejHSrPNrX2cNw KlMnobrWZAIvZWVldzkq6PEO+WiZfhBGrBGBXi0CN3MlqOn6Wpb9X1yKOTFn+I3bW0JFaJ o8lubHFa9ik+sMbFVj55LoloMaK0oq7ALR1kv+58YZ5FA7qU5U4mfuFI7PPhdXTFok3Szb SiCp6jLrLKj+I+U986jMNtCLEKodEB5AoGATQdYIUthSQDFwlXgpox0kHU4YJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657923482; a=rsa-sha256; cv=none; b=DyT9vFVN/aLNMPqEU7Z0O1jEjhGvO4Bq1vPeU3yvUSEm5jIQkYaId8eiCR5lguYInKHIH0 qCEBrPi5JS8DhkB/m/0ls6LSknrwqQSE2i+ORs2RPi0njVQOBe+kmafkZeI/6hB49uQDg/ 7IOfMj4unsjyyUKrqzbL3g8LaySKusaPlWEqZAMrZucW2eymsQIY4gV3EirqCPvLuemEM9 BUHp0euU26y392cmF+aUo9EHVY3N0s8MgSxfYPt7VqZjeceSXANBkVex2nWHNTex28WgYn sQDuk2CMSURCcLGQPt5UC5F6T6wYQI9dTrYzPJ5krYMw3g/kJOiQIQFTDNqhYw== 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=445421abc914536d6c36327a5dd1d1cd71e55a15 commit 445421abc914536d6c36327a5dd1d1cd71e55a15 Author: Jessica Clarke AuthorDate: 2022-07-15 22:03:49 +0000 Commit: Jessica Clarke CommitDate: 2022-07-15 22:03:49 +0000 Makefile.inc1: Honour DB_FROM_SRC for NO_ROOT distributeworld Currently the host's database files are used, but on non-FreeBSD these are not necessarily sufficient; in particular, Linux does not have a wheel group. Instead, use -N to use the in-tree database files when creating the METALOG entries, as is done for the recursive makes via IMAKE_MTREE. Reviewed by: brooks Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35810 --- Makefile.inc1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 73bbba7fef54..43cd3c3344c8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -964,12 +964,16 @@ WORLDTMP_MTREEFLAGS= -deUW # that are created by mtree to be owned by root/wheel. DESTDIR_MTREEFLAGS+= -W .endif -DISTR_MTREE= ${MTREE_CMD} +.if defined(DB_FROM_SRC) +DISTR_MTREEFLAGS= -N ${.CURDIR}/etc +.endif +DISTR_MTREECMD= ${MTREE_CMD} .if ${BUILD_WITH_STRICT_TMPPATH} != 0 -DISTR_MTREE= ${WORLDTMP}/legacy/usr/sbin/mtree +DISTR_MTREECMD= ${WORLDTMP}/legacy/usr/sbin/mtree .endif -WORLDTMP_MTREE= ${DISTR_MTREE} ${WORLDTMP_MTREEFLAGS} -DESTDIR_MTREE= ${DISTR_MTREE} ${DESTDIR_MTREEFLAGS} +DISTR_MTREE= ${DISTR_MTREECMD} ${DISTR_MTREEFLAGS} +WORLDTMP_MTREE= ${DISTR_MTREECMD} ${WORLDTMP_MTREEFLAGS} +DESTDIR_MTREE= ${DISTR_MTREECMD} ${DESTDIR_MTREEFLAGS} # kernel stage KMAKEENV= ${WMAKEENV:NSYSROOT=*}