From nobody Wed May 1 23:02:28 2024 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 4VVCJN32cyz5KD2D; Wed, 1 May 2024 23:02:28 +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 4VVCJN2d8Sz50n9; Wed, 1 May 2024 23:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714604548; 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=ukbrXbCkBeqtRR+yGKN0HXvcf9iQsq1itnEJ6A1Jr3Q=; b=O/AszLgiPwK3vX/3b9bAOFyvD74Y1IQB+xVYTdyu7nC2EhenMDfEkDboH+JZ03e08kXp0L 9hApotsA23IEizX+y21ExJ2CXxZ2OFOB6hUyImj8Nsh65WBrTusq2pBwRJey64KwrEgWsL Hz9da/mVRcU84RPqnxV5Y5A1I7eb9ZY97mXn4yIeZ8gqnRpMVcjJ3zWPGD6Thl7uk0eqpE K/yPwGvjFubCa/3LP/yh8lomeY/rPYho3BXOnuBP2M4SlvR10a5U6R/eFVG6o+rPk8pNtB EaC8iWvJNEIK08x/SRcXbly5yz1vAnn+6o9QWgZ9gEyxbLigwYeMiu9kIEySuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714604548; a=rsa-sha256; cv=none; b=WRIvpVp3eUZZYJ++urDwbjtfPLH8R56/64IRvF0oEyunEDaLQtxUEQv1rgbUoUkRO6RP2O b90+3Vkzta8tsxg/5wwtHTvyVEg011BeRhrNEAASa+YdE+sdvgVj4l4igsXyPOaT0o2dHb vqDH66mgZs/zJlyAqUK3jdux/cEzEItKamxz8s/uVL1kzbaJGoVtr8rfiYaeH+GZiHo9om 9eSvAnszWYseFJYzXo6WhNBoZbBhrALR5ssEks2KagJU88E3hwXXw1muUuXahVLNt8zv1o mAZOt3wLkdH17/ijRrllhPX7/pnhU1Q+OAgRQmJBwwtOPWWA76Rw17AKwb6VYw== 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=1714604548; 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=ukbrXbCkBeqtRR+yGKN0HXvcf9iQsq1itnEJ6A1Jr3Q=; b=TsKB56DnbmLxH3qqP1A4MB6K2X3sRgXip02pALp3Yj7t2hh53mZA1jyz5ULOVK5QaPD4wX hjlddUYGtl3BaTv9h5boAhzs6yjT6M+U6b0GX1unwVVIX6WgCDWz1zd8zyJDNRrevlLao9 aCQ+qG3cgOyUM73mzVM3BNZJxY+grbaUcug5s/gDcz/sr6YDQUho6PuJNOVkyWnemOhKys Tomk7NAAWUzlqxl+SoQBPbQbv+o/jDoIdYHLO2FS3a4JDrSptT6B6mgXTyPi9JQD94DcN5 aQCGmFADRqRGw13TADKrgEUQZDd8v8pmYCrpZ/aKt7PQhH8tKH5TpZiZnYroTA== 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 4VVCJN2FK5zf5H; Wed, 1 May 2024 23:02:28 +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 441N2SQf021443; Wed, 1 May 2024 23:02:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 441N2SeV021440; Wed, 1 May 2024 23:02:28 GMT (envelope-from git) Date: Wed, 1 May 2024 23:02:28 GMT Message-Id: <202405012302.441N2SeV021440@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: b07689d1f2a2 - main - beinstall: retire mergemaster support 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: b07689d1f2a268317bead0d785407b2f7dd7de78 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b07689d1f2a268317bead0d785407b2f7dd7de78 commit b07689d1f2a268317bead0d785407b2f7dd7de78 Author: Ed Maste AuthorDate: 2023-09-09 16:17:11 +0000 Commit: Ed Maste 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}"