diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-08-23 23:56:57 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-08-23 23:56:57 +0000 |
| commit | cc249d78007c7caaa7bdc3fa7d0fffc31ab38337 (patch) | |
| tree | 6b877027ad1da851ae932bfdd735ca74bcb00fcc /secure | |
| parent | 8f32e493cc1df9b61537ce9c5d5b4ec8e2bb4563 (diff) | |
| download | src-test-cc249d78007c7caaa7bdc3fa7d0fffc31ab38337.tar.gz src-test-cc249d78007c7caaa7bdc3fa7d0fffc31ab38337.zip | |
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
Notes
Notes:
svn path=/head/; revision=364600
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/caroot/blacklisted/Makefile | 2 | ||||
| -rw-r--r-- | 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 ab93d27793801..b7ccfbe88c03a 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 f159edddff054..eb382ad1bc74e 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} |