aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-05-09 02:01:29 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-05-09 02:01:29 +0000
commit70868d48e8f364c0d0620d2314c9a431699fa538 (patch)
tree678561b102cfe74ef97264d80e7f41161cec8f8a
parenta22a780752399c96bea63f2ce4d461d3a5f1a12f (diff)
downloadsrc-70868d48e8f364c0d0620d2314c9a431699fa538.tar.gz
src-70868d48e8f364c0d0620d2314c9a431699fa538.zip
installworld: attempt a certctl rehash at the tail end
This can be run as root or normal user with no problem; if they hadn't twisted the WITHOUT_CAROOT knob, we'll attempt to use the host certctl to rehash the DESTDIR. This would allow one to build systems WITHOUT_OPENSSL + WITH_CAROOT with a populated /etc/ssl that they can then use with an appropriate *ssl from somewhere else. Cross-builds are fine because this will always use the host certctl, or just nag if it's missing and it wasn't a WITHOUT_CAROOT build. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D24641
Notes
Notes: svn path=/head/; revision=360833
-rw-r--r--Makefile.inc110
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index a303bc9d4aa6..e1a8ce883fd8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1403,6 +1403,16 @@ 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