diff options
| author | Matthias Schiffer <matthias.schiffer@ew.tq-group.com> | 2025-03-20 12:02:33 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-24 17:29:16 +0000 |
| commit | 7ed9f4b7aac31b38f6b4bfd611550b955b130e7e (patch) | |
| tree | 2a62ba305f6a2bfd719b79fd8cd2b57638842186 | |
| parent | 239a262c12e27d3f8470f909854663a5dfefbba1 (diff) | |
| download | poky-7ed9f4b7aac31b38f6b4bfd611550b955b130e7e.tar.gz | |
curl: only set CA bundle in target build
In native/nativesdk builds, sysconfdir refers to a recipe sysroot
directory, which will disappear once the workdir is cleaned up, breaking
libcurl's HTTPS connections.
By simply not setting --with-ca-bundle at all in non-target builds, curl
defaults to the host system's CA certificates, which is desirable anyways
to allow builds in environments that require local CA certificates.
(From OE-Core rev: 4909a46e93ba774c960c3d3c277e2a669af3fea6)
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/curl/curl_8.12.1.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-support/curl/curl_8.12.1.bb b/meta/recipes-support/curl/curl_8.12.1.bb index 1e9e5a0229..dd1c89979a 100644 --- a/meta/recipes-support/curl/curl_8.12.1.bb +++ b/meta/recipes-support/curl/curl_8.12.1.bb | |||
| @@ -72,12 +72,14 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" | |||
| 72 | 72 | ||
| 73 | EXTRA_OECONF = " \ | 73 | EXTRA_OECONF = " \ |
| 74 | --disable-libcurl-option \ | 74 | --disable-libcurl-option \ |
| 75 | --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ | ||
| 76 | --without-libpsl \ | 75 | --without-libpsl \ |
| 77 | --enable-optimize \ | 76 | --enable-optimize \ |
| 78 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ | 77 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ |
| 79 | WATT_ROOT=${STAGING_DIR_TARGET}${prefix} \ | 78 | WATT_ROOT=${STAGING_DIR_TARGET}${prefix} \ |
| 80 | " | 79 | " |
| 80 | EXTRA_OECONF:append:class-target = " \ | ||
| 81 | --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ | ||
| 82 | " | ||
| 81 | 83 | ||
| 82 | fix_absolute_paths () { | 84 | fix_absolute_paths () { |
| 83 | # cleanup buildpaths from curl-config | 85 | # cleanup buildpaths from curl-config |
