From 20076f97fd18d22b22ee3695325d2e91ae812ad1 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 18 May 2020 01:48:55 +0000 Subject: [PATCH] Revert r360833, r360882: certctl rehash in installworld This was solving the correct-ish problem in the wrong place. Noted by brooks; while he didn't request a prompt revert, doing so now will facilitate proper testing for the revised version of this. --- Makefile.inc1 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 40a05de601a3..a303bc9d4aa6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1403,16 +1403,6 @@ distributeworld installworld stageworld: _installcheck_world .PHONY ${DESTDIR}/${DISTDIR}/${dist}.debug.meta .endfor .endif -.elif make(installworld) && ${MK_CAROOT} != "no" - # We could make certctl a bootstrap tool, but it requires OpenSSL and - # friends, which we likely don't want. We'll rehash on a best-effort - # basis, otherwise we'll just mention that we're not doing it to raise - # awareness. - @if which certctl>/dev/null; then \ - certctl rehash; \ - else \ - echo "No certctl on the host, not rehashing target -- /etc/ssl may not be populated."; \ - fi .endif packageworld: .PHONY