diff options
| author | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-12-13 18:02:45 +0000 |
|---|---|---|
| committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-12-13 18:02:45 +0000 |
| commit | 641eba2de4b4f238d2a9d37ab975a13129376d29 (patch) | |
| tree | 928c9e2ee97b48dd311ac9075ab4f9180cd9e464 | |
| parent | d04415c520b031fb8eb93cb252e4acee66149c87 (diff) | |
| download | src-641eba2de4b4f238d2a9d37ab975a13129376d29.tar.gz src-641eba2de4b4f238d2a9d37ab975a13129376d29.zip | |
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")
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 5 insertions, 0 deletions
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 |