git: 8ee478dfd46d - main - release: stop generating mergemaster databases

[Ed Maste]

The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8ee478dfd46dd972715a65134cef96fa5ef57dd0

commit 8ee478dfd46dd972715a65134cef96fa5ef57dd0
Author:     Ed Maste <ema...@freebsd.org>
AuthorDate: 2023-09-09 13:19:11 +0000
Commit:     Ed Maste <ema...@freebsd.org>
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