git: 641eba2de4b4 - main - Makefile.inc1: Reinstate building sbin/md5 for BOOTSTRAP_ALL_TOOLS

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Wed, 13 Dec 2023 18:02:55 UTC
The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=641eba2de4b4f238d2a9d37ab975a13129376d29

commit 641eba2de4b4f238d2a9d37ab975a13129376d29
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-12-13 18:02:45 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
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