Author: kevans
Date: Wed Aug 26 00:50:27 2020
New Revision: 364792
URL: https://svnweb.freebsd.org/changeset/base/364792
Log:
MFC r364600: caroot: switch to using echo+shell glob to enumerate certs
This solves an issue on stable/12 that causes certs to not get installed.
ls is apparently not in PATH during installworld, so TRUSTED_CERTS ends up
blank and nothing gets installed. We don't really require anything
ls-specific, though, so let's just simplify it.
Modified:
stable/12/secure/caroot/blacklisted/Makefile
stable/12/secure/caroot/trusted/Makefile
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/secure/caroot/blacklisted/Makefile
stable/11/secure/caroot/trusted/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/secure/caroot/blacklisted/Makefile
==============================================================================
--- stable/12/secure/caroot/blacklisted/Makefile Wed Aug 26 00:42:59
2020 (r364791)
+++ stable/12/secure/caroot/blacklisted/Makefile Wed Aug 26 00:50:27
2020 (r364792)
@@ -2,7 +2,7 @@
BINDIR= /usr/share/certs/blacklisted
-BLACKLISTED_CERTS!= ls ${.CURDIR}/*.pem 2> /dev/null || true
+BLACKLISTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true
FILES+= ${BLACKLISTED_CERTS}
Modified: stable/12/secure/caroot/trusted/Makefile
==============================================================================
--- stable/12/secure/caroot/trusted/Makefile Wed Aug 26 00:42:59 2020
(r364791)
+++ stable/12/secure/caroot/trusted/Makefile Wed Aug 26 00:50:27 2020
(r364792)
@@ -2,7 +2,7 @@
BINDIR= /usr/share/certs/trusted
-TRUSTED_CERTS!= ls ${.CURDIR}/*.pem 2> /dev/null || true
+TRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true
FILES+= ${TRUSTED_CERTS}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
