git: 0abe896f1921 - stable/14 - beinstall: Pass -B to etcupdate

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Sat, 07 Sep 2024 01:48:07 UTC
The branch stable/14 has been updated by jrtc27:

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

commit 0abe896f1921979d801daeebf1ae829678d3dd12
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2024-08-28 22:36:56 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2024-09-07 00:03:14 +0000

    beinstall: Pass -B to etcupdate
    
    Since commit 246364454fc1 ("etcupdate: Use new buildetc and installetc
    targets when available"), beinstall has been much slower for the
    etcupdate step, as it's been doing a kernel-toolchain (admittedly
    without LLVM itself being built). Given beinstall requires an object
    tree to already have been built and just installs it, we can pass -B to
    beinstall to reuse that tree rather than build kernel-toolchain in
    another one.
    
    Reported by:    olivier
    Tested by:      olivier
    MFC after:      1 week
    
    (cherry picked from commit 18aef07cfac41fde763e1328366cc6e334bb9254)
---
 tools/build/beinstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh
index 766a3a03739f..988414744d13 100755
--- a/tools/build/beinstall.sh
+++ b/tools/build/beinstall.sh
@@ -49,7 +49,7 @@ NO_PKG_UPGRADE="${NO_PKG_UPGRADE:-""}"
 # empty string to skip.
 CONFIG_UPDATER="${CONFIG_UPDATER:-"etcupdate"}"
 # Flags for etcupdate if used.
-ETCUPDATE_FLAGS="${ETCUPDATE_FLAGS:-"-F"}"
+ETCUPDATE_FLAGS="${ETCUPDATE_FLAGS:-"-BF"}"
 # Flags for mergemaster if used.
 MERGEMASTER_FLAGS="${MERGEMASTER_FLAGS:-"-iFU"}"