hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-22 03:04:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

beinstall: retire mergemaster support

Browse Source 
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
This commit is contained in:
Ed Maste 2023-09-09 12:17:11 -04:00
parent 98c8caafff
commit b07689d1f2
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
share/man/man8/beinstall.8
View File

@ -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

15
tools/build/beinstall.sh
View File

@ -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}"