diff options
| author | Changqing Li <changqing.li@windriver.com> | 2025-04-28 13:53:05 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-05-02 08:20:12 -0700 |
| commit | 2e0b9e9a86f6bd2ba13082e31d7c097b254f30a4 (patch) | |
| tree | a7fda622eeddd5e43d7cdf72e6046a7463e3ebef /meta/recipes-support/curl | |
| parent | f587cfcb8aac3c53f1c029e7809bfcc8f30a4f05 (diff) | |
| download | poky-2e0b9e9a86f6bd2ba13082e31d7c097b254f30a4.tar.gz | |
buildtools-tarball: move setting of envvars to respective envfile
* make git,curl,python3-requests align with openssl, move the setting of
envvars into respective envfile
* for environment.d-openssl.sh, also check if ca-certificates.crt exist
before export envvars
(From OE-Core rev: 5f4fd544d3df7365224599c9efdce4e545f51d5e)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-support/curl')
| -rw-r--r-- | meta/recipes-support/curl/curl/environment.d-curl.sh | 3 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_8.7.1.bb | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh new file mode 100644 index 0000000000..0d53aabb8e --- /dev/null +++ b/meta/recipes-support/curl/curl/environment.d-curl.sh | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | if [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then | ||
| 2 | export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" | ||
| 3 | fi | ||
diff --git a/meta/recipes-support/curl/curl_8.7.1.bb b/meta/recipes-support/curl/curl_8.7.1.bb index 8ce8caadf0..2f5bf8c8fd 100644 --- a/meta/recipes-support/curl/curl_8.7.1.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb | |||
| @@ -25,6 +25,11 @@ SRC_URI = " \ | |||
| 25 | file://CVE-2024-11053-0003.patch \ | 25 | file://CVE-2024-11053-0003.patch \ |
| 26 | file://CVE-2025-0167.patch \ | 26 | file://CVE-2025-0167.patch \ |
| 27 | " | 27 | " |
| 28 | |||
| 29 | SRC_URI:append:class-nativesdk = " \ | ||
| 30 | file://environment.d-curl.sh \ | ||
| 31 | " | ||
| 32 | |||
| 28 | SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" | 33 | SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" |
| 29 | 34 | ||
| 30 | # Curl has used many names over the years... | 35 | # Curl has used many names over the years... |
| @@ -108,6 +113,8 @@ do_install:append:class-target() { | |||
| 108 | 113 | ||
| 109 | do_install:append:class-nativesdk() { | 114 | do_install:append:class-nativesdk() { |
| 110 | fix_absolute_paths | 115 | fix_absolute_paths |
| 116 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | ||
| 117 | install -m 644 ${WORKDIR}/environment.d-curl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/curl.sh | ||
| 111 | } | 118 | } |
| 112 | 119 | ||
| 113 | do_compile_ptest() { | 120 | do_compile_ptest() { |
| @@ -156,6 +163,8 @@ RRECOMMENDS:lib${BPN} += "ca-certificates" | |||
| 156 | 163 | ||
| 157 | FILES:${PN} += "${datadir}/zsh" | 164 | FILES:${PN} += "${datadir}/zsh" |
| 158 | 165 | ||
| 166 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/curl.sh" | ||
| 167 | |||
| 159 | inherit multilib_script | 168 | inherit multilib_script |
| 160 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" | 169 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" |
| 161 | 170 | ||
