From 9497778a4d756daa29c4fa8d45d1a242d63ab8cc Mon Sep 17 00:00:00 2001 From: Moritz Haase Date: Fri, 28 Nov 2025 14:19:23 +0100 Subject: [PATCH] curl: Ensure 'CURL_CA_BUNDLE' from host env is indeed respected Due to what looks like a copy'n'paste mistake, the environment setup script might override 'CURL_CA_BUNDLE' from the host env instead of leaving it untouched. Fix that. (cherry picked from commit 545e43a7a45be02fda8fc3af69faa20e889f58c4) CC: changqing.li@windriver.com CC: raj.khem@gmail.com CC: Peter.Marko@siemens.com (From OE-Core rev: ef198b0c6063ede32cb93fe44eb89937c076a073) Signed-off-by: Moritz Haase Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Steve Sakoman --- meta/recipes-support/curl/curl/environment.d-curl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh index 581108ef35..b948db2cf6 100644 --- a/meta/recipes-support/curl/curl/environment.d-curl.sh +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh @@ -1,6 +1,6 @@ # Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detected host cert, then cert in buildtools -# CAFILE/CAPATH is auto-deteced when source buildtools -if [ -z "${CURL_CA_PATH:-}" ]; then +# CAFILE/CAPATH is auto-detected when source buildtools +if [ -z "${CURL_CA_BUNDLE:-}" ]; then if [ -n "${CAFILE:-}" ];then export CURL_CA_BUNDLE="$CAFILE" elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then