From nobody Wed Sep 20 11:29:47 2023 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 4RrGXW4m9nz4tXC6; Wed, 20 Sep 2023 11:29:47 +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 4RrGXW4Bfhz4ftS; Wed, 20 Sep 2023 11:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695209387; 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=/rhOK3NXaYiAnF+iFu42lef/r/pUUTP7HdUyQd5oo+0=; b=u8OCKD/mUCtx4HkqrVMjyzhwWUZ7uZWsE8WgPRcoqwnn/ZnMa5b0iq/lth+PyQ3SKoBb7c G+CaazOqNJGZ1OqsFVcChnl/UxSBxp2hPqbmyVyyDhIfsgWiNiGNkn6W8ZGk8zpjAAEcG/ M4QZxv0TRjtK29AJ+up2Kpkwo06oey6DCStWbrB6dv9fJJvZqlXisDX3xF//cVRbYoAenF KDm0t/YSA07dJ+38ATzP2lzKQd9E5z9gHvsYcVxwCvFnWgJAA5uUSDhrn7nHeBuFGduOXW uD6z9diB/tn4xoXAD/njdBxNDFJT+/KrqZxygury60M1EzAtWKdJ1THLBoMkXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695209387; a=rsa-sha256; cv=none; b=Xbw45hqqBoki1kakVr7dtPa91OtEKE+uy6DdY1jH6I9emw1jCz/M5n30wY8QavgQvtcB90 JBwM9yGuJKIc8IFNeODkSSI8ytGdWqNUT2UnNgWV9hGLX/SBdMMXM7IRLUPAJHvcLwKm1p Et047b6zwxJCEcGheASd51Ahcf4tTg6Lr4Ex8S2Jig5vTU+T4p49XkTSfNp/GKShegR6r0 /UBLzNd84Pi4riw2v5gP/cTmMK+4otOyTXgS16A4FJIhKL3hY8Mc1mUa9QcVNlFxfU4LRz CoQDgTfCCnHiIHejSXgP6RnngHmZUVcO25VGY5RHpyCeYU1PnjeAgAmNRaeq7Q== 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=1695209387; 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=/rhOK3NXaYiAnF+iFu42lef/r/pUUTP7HdUyQd5oo+0=; b=o/lCAv7FJcVcICPIKAFFVBwbzT7oLiUp6rH4YQQNpbQojtFA7keuNbL/wsBhb3fIHqR6xh 87DO0bFMMbcQCtmtJOnIYRbkUEAGKDDtkiWFDuWT1khv6j/MiVvYbASRSTTxXFOT3Tx/pW 335n6kMII6V0gfVKSz137nT9njR+qkrITB72NcCs20B9+OM6Fio5lasu7EHUohpI2/6nJb I7K7jWc7FTrbuc5izfUziDpnWx2mSjmL7nh3G0TpWwzTS/RP/KVcuYes9VwedU6C6CNS0F zXPgi7zwvOsmHNCdjDa9XWe/oQlEDh8JOgs1gMraMTcJzkZKAmmu1QBGyLv5dg== 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 4RrGXW3CGQztqM; Wed, 20 Sep 2023 11:29:47 +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 38KBTl4w087468; Wed, 20 Sep 2023 11:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KBTlvE087465; Wed, 20 Sep 2023 11:29:47 GMT (envelope-from git) Date: Wed, 20 Sep 2023 11:29:47 GMT Message-Id: <202309201129.38KBTlvE087465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8ee478dfd46d - main - release: stop generating mergemaster databases 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ee478dfd46dd972715a65134cef96fa5ef57dd0 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee478dfd46dd972715a65134cef96fa5ef57dd0 commit 8ee478dfd46dd972715a65134cef96fa5ef57dd0 Author: Ed Maste AuthorDate: 2023-09-09 13:19:11 +0000 Commit: Ed Maste CommitDate: 2023-09-20 11:28:40 +0000 release: stop generating mergemaster databases mergemaster was deprecated some time ago and will be removed from FreeBSD 15. Reviewed by: imp Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41797 --- release/Makefile | 8 +------- release/tools/vmimage.subr | 5 +---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/release/Makefile b/release/Makefile index 1ea3f6a284a5..3af7825c2684 100644 --- a/release/Makefile +++ b/release/Makefile @@ -118,13 +118,7 @@ clean: beforeclean base.txz: mkdir -p ${DISTDIR} cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR} -# 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 + # Bootstrap etcupdate(8) database. 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" \ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index f8b132875cdc..6db8bea7c978 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -56,14 +56,11 @@ vm_install_base() { installworld installkernel distribution || \ err "\n\nCannot install the base system to ${DESTDIR}." - # Bootstrap etcupdate(8) and mergemaster(8) databases. + # Bootstrap etcupdate(8) database. mkdir -p ${DESTDIR}/var/db/etcupdate etcupdate extract -B \ -M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ -s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate - sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \ - -F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \ - -D ${DESTDIR} echo '# Custom /etc/fstab for FreeBSD VM images' \ > ${DESTDIR}/etc/fstab