diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-09-09 16:17:11 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2024-05-01 23:02:00 +0000 |
| commit | b07689d1f2a268317bead0d785407b2f7dd7de78 (patch) | |
| tree | edb6c37b28cb2ab09ceb52221396bf4dbdf2c07e /tools | |
| parent | 98c8caafffb65203640226dba5564921448067b8 (diff) | |
| download | src-b07689d1f2a268317bead0d785407b2f7dd7de78.tar.gz src-b07689d1f2a268317bead0d785407b2f7dd7de78.zip | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build/beinstall.sh | 15 |
1 files changed, 1 insertions, 14 deletions
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}" |