From nobody Sat Sep 07 01:48:07 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 4X0wwR4vJTz5WSP7; Sat, 07 Sep 2024 01:48:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X0wwR3R80z4kS8; Sat, 7 Sep 2024 01:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725673687; 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=TiOyh+tGmTuGW3T2l0F7F3bIzwEiazCB6sdKkDZiTd8=; b=PVYgWkYdeU5YSux2y61j6xyxOi2V/fCNvm056CHpr94AsHhJr8g5hwM9gZHVJrvNAUrtNB 0hf7zxjgHRLYX5wW4IcYLGBShIuGtkm1cvSOfCdDJdr0r2LslzZS8T5S0yhfkDqEGGHf03 oI5QincQW6WvxFdzDX71BrkBU2Kd5WrEBrfHPAUgmpvYAEn1IGoaCwjdrcTf5d3k1TrRfF vX9J9Z6BcvtuMXkTefjCr9eiPv2UZIEv1HXtycoqDDjTe08G0moBIt/4iGY64KVISp6Xrn ZpG5ZMr3QW78vRyz+znWC+CthcIk86Y+CKZdEmFjQHoncqYCe+pNLhLenKyoMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725673687; a=rsa-sha256; cv=none; b=bgxIkNbhnAH/IxgllpjwW2BnsOY4wExhmM02eFk/qTiGKaQ0JsF1KchRjHwZ50NbrN0sLr N/6kMhNXxsHmnKDXO5mEIw6sbIWX9IEPw9JqYf57GCxqbO3fjgRWbZ0u1UOUkuBTJJ6jbO ClTIqsw/tdvN7YhcZyGt7IyKnwYlcrTtKflyGqP1I9fmTl0WAPZStu0/zbQuqAEzRZ94wJ 7CW+IuFA3jSKTnD+kkNQ66ukleI1tPOnLYZ3OWo0uLhLcC4igueHAbJheTNkv5XhyejP61 tvwsD+AWJemBHAf3rYYij4UVOX7on3HN15C1WzWy5j/ZRsW4OJuVHMBEg9wMkA== 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=1725673687; 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=TiOyh+tGmTuGW3T2l0F7F3bIzwEiazCB6sdKkDZiTd8=; b=RNDfY1/wgGdU379JWvZUmYhLUe9bm/6W/mdIU/ncLQ7niglM05f0UfRcecLcORccYMhYNg 8Od3JFcUMdrw5OxSCBn/X3LsBXNhj2Oa5t/6vuSKwZaQQumYJ5nHh2BVi9dK6uD9UXPhb9 Vutt0WGh6j8UXcweloW25ebVk+UC3LolOY26h+QbgWNagqKZWmBm78ln+16wsgnaTGYGGB QJRFt/yVH1U0Zg8S27BreovohRCnrs6mhBqVucqt3RZtm9/hIRCoVgI1VVwLNzAUxLTYnb g8m8Cv8175ME8bEUGf2TGEIyVfkjyKDdsTvJdDI+b6y7oA5M4GOHkBEvs0qRGA== 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 4X0wwR33XczFfV; Sat, 7 Sep 2024 01:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4871m7hZ042071; Sat, 7 Sep 2024 01:48:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4871m7cL042068; Sat, 7 Sep 2024 01:48:07 GMT (envelope-from git) Date: Sat, 7 Sep 2024 01:48:07 GMT Message-Id: <202409070148.4871m7cL042068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 0abe896f1921 - stable/14 - beinstall: Pass -B to etcupdate 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0abe896f1921979d801daeebf1ae829678d3dd12 Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0abe896f1921979d801daeebf1ae829678d3dd12 commit 0abe896f1921979d801daeebf1ae829678d3dd12 Author: Jessica Clarke AuthorDate: 2024-08-28 22:36:56 +0000 Commit: Jessica Clarke 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"}"