From nobody Wed Dec 13 18:02:55 2023 X-Original-To: dev-commits-src-main@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 4Sr3HM3VWHz5460T; Wed, 13 Dec 2023 18:02:55 +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 4Sr3HM2YTgz4Gd6; Wed, 13 Dec 2023 18:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702490575; 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=8r+ARCSISj6o+RmsQ81kdCGHf25ie3J8K3W6oQGJTdg=; b=hKbngngKzohmMVjXxJJe3cmOXPR4djiqtpy91w1av5hg3k2VmjQnqpR9LP1gwaSN6tgrz1 pWVoVyYatdWAO4WWYBIRUUOfOw72fLvTJBMvXQ2kF+2abW3VGNt7/OcscahtzyUhyOUO0D 6P2ecZzK0FIxyEX3RSKkih1msgCDiVQqBPKgzSq4m2OaZ8ZPUIIW9/SFhN1gtBgNWnB7/g Vtrd9u5UfpS/vgEftkq7U2NZupkwwtORs199rkUtyL+6fB0uERpm4LTSzxjrS+7arWMkMu 5BdUjUfeCU3x9XeXV12GH5h0UQuLiHVcT6ZjPNBm2541kNwNx2Y+NmF7elvElA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702490575; a=rsa-sha256; cv=none; b=YZ5VzOhPvG026rII3j2KdGkOD+b3x/JmyY0+ItHNfNCAYtv6oT30OymMdj6amGxqUcjZpt hjzpRe/O/GxqnjgakK59KNM/KnQlcHKBTanWVa0praRU57mV2omYOvi3bBZqSmLyeczMZ+ YbMTn37Co6JNh+/oEYUxVeZkQCS7tvkJ8rd7gbEH8oKH1lPZCWnt5en1wtwVYxCTOAdzII BlPA27qHlqrj0OKJZl5aCA9EKC/W4bRJQZQllOAhelS6UO0O5btaxYMudVr2iKid2or3iU BnnMaL5wPWIeqKwTKnISYGXSw0OjkLzC68lDhIuSxY0LW3fPkA68Pcf7OteQsg== 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=1702490575; 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=8r+ARCSISj6o+RmsQ81kdCGHf25ie3J8K3W6oQGJTdg=; b=k+VTkD+Al2aAunHxcuy4AX2lBd7AYo2+YFzEn4KxHtt1ZuULVmvCbwih2IwBopIEBxqUkc WXVWcTzbetqbpUoOTUNuN2rlY72/YwAQyqBYhzar8CoyYLhwUy45u6/ohW1GoqIvepOCaA cuMYvaE2K+0TPVVjor68OXoy28T7uN8wSuuLZpq/6CWNQhU/9QvCT+b4UNiTa4D3+lnUvx 9zWqBWEphHvAc7Fh+DTU06NaVQlcKEMTWHklQn4vxeZJLionzWhWPuFNI5suh2xXjLktNn F1Xm8ohViOINbx+fIADuiVAATKcoOak/Hb8hyJE/Rr41JVnUeBtgq5HYR3K0zQ== 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 4Sr3HM1d5gz17Hl; Wed, 13 Dec 2023 18:02:55 +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 3BDI2txp084650; Wed, 13 Dec 2023 18:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDI2tH1084647; Wed, 13 Dec 2023 18:02:55 GMT (envelope-from git) Date: Wed, 13 Dec 2023 18:02:55 GMT Message-Id: <202312131802.3BDI2tH1084647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 641eba2de4b4 - main - Makefile.inc1: Reinstate building sbin/md5 for BOOTSTRAP_ALL_TOOLS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 641eba2de4b4f238d2a9d37ab975a13129376d29 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=641eba2de4b4f238d2a9d37ab975a13129376d29 commit 641eba2de4b4f238d2a9d37ab975a13129376d29 Author: Jessica Clarke AuthorDate: 2023-12-13 18:02:45 +0000 Commit: Jessica Clarke CommitDate: 2023-12-13 18:02:45 +0000 Makefile.inc1: Reinstate building sbin/md5 for BOOTSTRAP_ALL_TOOLS The sha256 and sha512 binaries are used when building release images. Bootstrapping them used to be gated on MK_BOOT, which wasn't quite right but in practice worked, at least in our use cases downstream. Add back bootstrapping sbin/md5 and its aliases for this purpose to fix building release images on Linux and macOS. Fixes: f213da893ca8 ("Makefile.inc1: Remove beri straggler") --- Makefile.inc1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index b509b603821b..3d982e45fd63 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2594,6 +2594,11 @@ _basic_bootstrap_tools+=usr.bin/mkfifo # jot is needed for the mkimg tests _basic_bootstrap_tools+=usr.bin/jot +.if defined(BOOTSTRAP_ALL_TOOLS) +# sha256 and sha512 are used by release/ (and possibly others) +_basic_bootstrap_tools+=sbin/md5 +.endif + # tzsetup is needed as an install tool .if ${MK_ZONEINFO} != "no" _basic_bootstrap_tools+=usr.sbin/tzsetup