Author: kevans
Date: Sun Aug 23 23:56:57 2020
New Revision: 364600
URL: https://svnweb.freebsd.org/changeset/base/364600
Log:
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.
MFC after: 3 days
Modified:
head/secure/caroot/blacklisted/Makefile
head/secure/caroot/trusted/Makefile
Modified: head/secure/caroot/blacklisted/Makefile
==============================================================================
--- head/secure/caroot/blacklisted/Makefile Sun Aug 23 23:39:51 2020
(r364599)
+++ head/secure/caroot/blacklisted/Makefile Sun Aug 23 23:56:57 2020
(r364600)
@@ -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: head/secure/caroot/trusted/Makefile
==============================================================================
--- head/secure/caroot/trusted/Makefile Sun Aug 23 23:39:51 2020
(r364599)
+++ head/secure/caroot/trusted/Makefile Sun Aug 23 23:56:57 2020
(r364600)
@@ -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}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
