From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 26 Oct 2022 21:03:29 +0000 (+0100)
Subject: openssl: Fix SSL_CERT_FILE to match ca-certs location
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2724
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d383a7fc6da666c80f2fc037af5f49a3388eb2b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

openssl: Fix SSL_CERT_FILE to match ca-certs location

In OE-Core d6b15d1e70b99185cf245d829ada5b6fb99ec1af,
"openssl: export necessary env vars in SDK", the value added for
SSL_CERT_FILE was in conflict with the value used elsewhere, such as
in buildtools. This makes them match and fixes buildtools testsdk
failures.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh
index 516bbd1c560..6f23490c872 100644
--- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh
+++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh
@@ -1,5 +1,5 @@
 export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf"
 export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs"
-export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/cert.pem"
+export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt"
 export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/"
 export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3"