From cc249d78007c7caaa7bdc3fa7d0fffc31ab38337 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Sun, 23 Aug 2020 23:56:57 +0000 Subject: [PATCH] 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 --- secure/caroot/blacklisted/Makefile | 2 +- secure/caroot/trusted/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/secure/caroot/blacklisted/Makefile b/secure/caroot/blacklisted/Makefile index ab93d2779380..b7ccfbe88c03 100644 --- a/secure/caroot/blacklisted/Makefile +++ b/secure/caroot/blacklisted/Makefile @@ -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} diff --git a/secure/caroot/trusted/Makefile b/secure/caroot/trusted/Makefile index f159edddff05..eb382ad1bc74 100644 --- a/secure/caroot/trusted/Makefile +++ b/secure/caroot/trusted/Makefile @@ -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}