diff options
| author | Moritz Haase <Moritz.Haase@bmw.de> | 2025-11-28 14:19:23 +0100 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-12-05 07:13:42 -0800 |
| commit | 9497778a4d756daa29c4fa8d45d1a242d63ab8cc (patch) | |
| tree | 626aff4d92fa27839b80a67c4be6caddc190bb33 | |
| parent | 295e960b85c68089eaaf987f3f5ea144b62c5d25 (diff) | |
| download | poky-scarthgap.tar.gz | |
curl: Ensure 'CURL_CA_BUNDLE' from host env is indeed respectedscarthgap
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 <Moritz.Haase@bmw.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-support/curl/curl/environment.d-curl.sh | 4 |
1 files 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 @@ | |||
| 1 | # Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detected host cert, then cert in buildtools | 1 | # Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detected host cert, then cert in buildtools |
| 2 | # CAFILE/CAPATH is auto-deteced when source buildtools | 2 | # CAFILE/CAPATH is auto-detected when source buildtools |
| 3 | if [ -z "${CURL_CA_PATH:-}" ]; then | 3 | if [ -z "${CURL_CA_BUNDLE:-}" ]; then |
| 4 | if [ -n "${CAFILE:-}" ];then | 4 | if [ -n "${CAFILE:-}" ];then |
| 5 | export CURL_CA_BUNDLE="$CAFILE" | 5 | export CURL_CA_BUNDLE="$CAFILE" |
| 6 | elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then | 6 | elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then |
