Date: Sun, 23 Aug 2020 23:56:58 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364600 - in head/secure/caroot: blacklisted trusted Message-ID: <202008232356.07NNuwjY055655@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008232356.07NNuwjY055655>