From nobody Tue Aug 09 21:59:08 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 4M2RmY2JB5z4YHZ8; Tue, 9 Aug 2022 21:59:09 +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 4M2RmY0xKpz42gt; Tue, 9 Aug 2022 21:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082349; 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=XIrM/PYTZetXP+nwQc7mlJ4ZuV2kSRBk1bDxgqjtgTQ=; b=x6rPBZyOeo0rOPe2ugWauXT7Pjby1TLPXIsouXUejtkr9eHkbeq1m2EzvoXL9s56ATmgOT ky10i/eDj+BMVPIqmUfkGkznLRGibPAHwEqzOQMJ1dTsVCRpPf4811+QLJ8wCcrDvVhsRk i1Rm+jdqLaa1pzELqZoPDl+jihX2gDuk9GT+009uY8GCSFWUk55bZwF6ReMPvgt79Hv2fc VZlfoMMHJi3BUDbssvVlvcklsDmKhgWE+Q4S+3n6ixg0ZGw5ksb5YEzY+ytz+kEqVHHAcS iLpa9NAyRKSJC/OIV/KI4lOnuuNhhDxDGjwY9VlNxKKyf70XoPZfUWY6fkW/LQ== 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 4M2RmX6zN2znBs; Tue, 9 Aug 2022 21:59:08 +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 279Lx8qg086553; Tue, 9 Aug 2022 21:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279Lx8Lk086552; Tue, 9 Aug 2022 21:59:08 GMT (envelope-from git) Date: Tue, 9 Aug 2022 21:59:08 GMT Message-Id: <202208092159.279Lx8Lk086552@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: f36b5d8a8c30 - main - release: Include an etcupdate tree in -DNO_ROOT release image builds 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: f36b5d8a8c3090da9121a32131667580ff678a69 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082349; 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=XIrM/PYTZetXP+nwQc7mlJ4ZuV2kSRBk1bDxgqjtgTQ=; b=wvrQptbBoo4GTCJRbXtlZG5/pw/BoZAuys5nGhF+IYBZYQ3+t26AQ/jP2D6bzHweAxVz7m INZ5c6n7ZRBjImG+/0FohBhb7MwKf/JOVhXapK63GwRPZOEMdZTyGR4fVRRMZgi0KoqPhn pF2HrRK62LAlSdRvukYZ4I+lNN3wG1e15XTEz5+1cIVKW3IWw+/eH4IkeS2X1tmiQ1fCyi lisMeyQEx9kI/GcCGAeqIvbfH2Dci02ZdbBfrreGpJh5raGRg2Guno0+ik2mZVRdzLH6Ls tzFuxX1TLMXwDECrZSmbUpvEXpEVZklQni1BoB1N3zEd5JIiw1dgmS51HS4/Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660082349; a=rsa-sha256; cv=none; b=Q8E2xfyR+kKZEQalBLpWbdUCdDl01aReKppug0hrndDZKuk9x2W9aZMUyvR0a5qKv4H7bH Hv48enqe1azJKjdmrr9MYyFUlevxS9doapGdIvuO5VqRQWBZR1ucFX2rB7kDKFlHJL1aJ2 tRqiXSxUs8wOb6WMZDHDsiBWspFRT5iVIr9yNWv4aZrdq4fGpkSEIuFWdAvuvLYbvIXIib TsyLnJx2Qnj8VAMq16/Y7aLluHZmKA+gwUlAYqDA6Ja/NZvjBYhVtAw0YnKQRBaqBIVdvm AWS+J8DpEoiYVTaPNjRwh00SbEFLZfhwwpyvSbimfK4KTv874d/AneBgBv+IoQ== 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=f36b5d8a8c3090da9121a32131667580ff678a69 commit f36b5d8a8c3090da9121a32131667580ff678a69 Author: Jessica Clarke AuthorDate: 2022-08-09 21:58:01 +0000 Commit: Jessica Clarke CommitDate: 2022-08-09 21:58:01 +0000 release: Include an etcupdate tree in -DNO_ROOT release image builds This makes use of the new -N etcupdate flag and merges the resulting METALOG into base.meta re-rooted to /var/db/etcupdate/current. Reviewed by: gjb Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35858 --- release/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index fe932b3d1a76..7aeca8cc0276 100644 --- a/release/Makefile +++ b/release/Makefile @@ -117,15 +117,22 @@ clean: beforeclean base.txz: mkdir -p ${DISTDIR} cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} -# TODO: Add NO_ROOT mode to mm-tree.sh and etcupdate +# TODO: Add NO_ROOT mode to mm-tree.sh .if !defined(NO_ROOT) # Set up mergemaster root database 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" +.endif sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ - -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" + -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \ + ${NO_ROOT:D-N} +.if defined(NO_ROOT) + echo "./var/db/etcupdate type=dir uname=root gname=wheel mode=0755" >> ${.OBJDIR}/${DISTDIR}/base.meta + sed -n 's,^\.,./var/db/etcupdate/current,p' ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG \ + >> ${.OBJDIR}/${DISTDIR}/base.meta + rm ${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate/current/METALOG .endif # Package all components cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR}