git: b07689d1f2a2 - main - beinstall: retire mergemaster support

The branch main has been updated by emaste:

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

commit b07689d1f2a268317bead0d785407b2f7dd7de78
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-09-09 16:17:11 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-05-01 23:02:00 +0000

    beinstall: retire mergemaster support
    
    Mergemaster has been deprecated for some time, and will be retired.
    
    Reviewed by:    kevans
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D41799
---
 share/man/man8/beinstall.8 | 15 +++------------
 tools/build/beinstall.sh   | 15 +--------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/share/man/man8/beinstall.8 b/share/man/man8/beinstall.8
index e403f25d2f35..114483ba752a 100644
--- a/share/man/man8/beinstall.8
+++ b/share/man/man8/beinstall.8
@@ -41,10 +41,8 @@ source tree.
 also automatically performs
 .Pa /etc
 updates
-(using either
-.Xr etcupdate 8
-or
-.Xr mergemaster 8 )
+(using
+.Xr etcupdate 8 )
 and
 package updates using
 .Xr pkg-upgrade 8
@@ -88,18 +86,12 @@ from ports (sysutils/beadm).
 .It Ev CONFIG_UPDATER Pq default: Dq Li "etcupdate"
 Config updater:
 .Xr etcupdate 8
-and
-.Xr mergemaster 8
-are supported.
+is supported.
 Set to an empty string to skip.
 .It Ev ETCUPDATE_FLAGS Pq default: Dq Li "-F"
 Flags for
 .Xr etcupdate 8
 if used.
-.It Ev MERGEMASTER_FLAGS Pq default: Dq Li "-iFU"
-Flags for
-.Xr mergemaster 8
-if used.
 .It Ev NO_PKG_UPGRADE Pq default: Dq Li ""
 If not empty,
 .Dq Li pkg upgrade
@@ -117,7 +109,6 @@ lives in the src tree.
 .Xr development 7 ,
 .Xr bectl 8 ,
 .Xr etcupdate 8 ,
-.Xr mergemaster 8 ,
 .Xr pkg 8
 .Sh HISTORY
 .Nm
diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh
index 766a3a03739f..7f7481b671f5 100755
--- a/tools/build/beinstall.sh
+++ b/tools/build/beinstall.sh
@@ -45,13 +45,10 @@
 BE_UTILITY="${BE_UTILITY:-"bectl"}"
 # If not empty, 'pkg upgrade' will be skipped.
 NO_PKG_UPGRADE="${NO_PKG_UPGRADE:-""}"
-# Config updater - 'etcupdate' and 'mergemaster' are supported.  Set to an
-# empty string to skip.
+# Config updater - 'etcupdate' is supported.  Set to an empty string to skip.
 CONFIG_UPDATER="${CONFIG_UPDATER:-"etcupdate"}"
 # Flags for etcupdate if used.
 ETCUPDATE_FLAGS="${ETCUPDATE_FLAGS:-"-F"}"
-# Flags for mergemaster if used.
-MERGEMASTER_FLAGS="${MERGEMASTER_FLAGS:-"-iFU"}"
 
 
 ########################################################################
@@ -122,14 +119,6 @@ create_be_dirs() {
 	return 0
 }
 
-update_mergemaster_pre() {
-	${MERGEMASTER_CMD} -p -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
-}
-
-update_mergemaster() {
-	${MERGEMASTER_CMD} -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
-}
-
 update_etcupdate_pre() {
 	${ETCUPDATE_CMD} -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
 	${ETCUPDATE_CMD} resolve -D ${BE_MNTPT} || return $?
@@ -176,7 +165,6 @@ objdir=$(make -V .OBJDIR 2>/dev/null)
 
 ## Constants
 ETCUPDATE_CMD="${srcdir}/usr.sbin/etcupdate/etcupdate.sh"
-MERGEMASTER_CMD="${srcdir}/usr.sbin/mergemaster/mergemaster.sh"
 
 # May be a worktree, in which case .git is a file, not a directory.
 if [ -e .git ] ; then
@@ -206,7 +194,6 @@ BE_TMP=$(mktemp -d /tmp/beinstall.XXXXXX)
 [ $? -ne 0 -o ! -d ${BE_TMP} ] && errx "Unable to create mountpoint"
 [ -z "$NO_CLEANUP_BE" ] && cleanup_commands="rmdir_be ${cleanup_commands}"
 BE_MNTPT=${BE_TMP}/mnt
-BE_MM_ROOT=${BE_TMP}/mergemaster # mergemaster will create
 mkdir -p ${BE_MNTPT}
 
 ${BE_UTILITY} create ${BENAME} >/dev/null || errx "Unable to create BE ${BENAME}"