summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Joslyn <robert.joslyn@redrectangle.org>2022-01-09 11:08:04 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-11 15:48:11 +0000
commit056ba497d712f1b13a373b784c1a75d10b009364 (patch)
tree43423dda3995e86be75c4e4c91d3b06f98dbc344
parent9050f383b59c439569b60bc84aa4a02f4d9d2b8f (diff)
downloadpoky-056ba497d712f1b13a373b784c1a75d10b009364.tar.gz
curl: Rework openssl and random PACKAGECONFIGs
The existing ssl PACKAGECONFIG makes it slightly annoying to use another crypto provider while removing openssl. Since --with-ssl is just a deprecated version of --with-openssl, rename the PACKAGECONFIG to use the newer preferred name. Note that --without-ssl implies no crypto provider at all, and should only be used when trying to disable all crypto support. Move --with-random to it's own option, since it is useful for other crypto providers, not just openssl. (From OE-Core rev: eef6c45fc6ec0a496791123e8ba2f400a5d9d468) Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/curl/curl_7.81.0.bb12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-support/curl/curl_7.81.0.bb b/meta/recipes-support/curl/curl_7.81.0.bb
index 30bd928751..c22a13cfea 100644
--- a/meta/recipes-support/curl/curl_7.81.0.bb
+++ b/meta/recipes-support/curl/curl_7.81.0.bb
@@ -17,9 +17,12 @@ CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl dan
17 17
18inherit autotools pkgconfig binconfig multilib_header 18inherit autotools pkgconfig binconfig multilib_header
19 19
20PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} ssl libidn proxy threaded-resolver verbose zlib" 20# Entropy source for random PACKAGECONFIG option
21PACKAGECONFIG:class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" 21RANDOM = "/dev/urandom"
22PACKAGECONFIG:class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" 22
23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} libidn openssl proxy random threaded-resolver verbose zlib"
24PACKAGECONFIG:class-native = "ipv6 openssl proxy random threaded-resolver verbose zlib"
25PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver verbose zlib"
23 26
24# 'ares' and 'threaded-resolver' are mutually exclusive 27# 'ares' and 'threaded-resolver' are mutually exclusive
25PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" 28PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver"
@@ -39,13 +42,14 @@ PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
39PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" 42PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls"
40PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," 43PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt,"
41PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" 44PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2"
45PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
42PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," 46PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3,"
43PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," 47PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy,"
48PACKAGECONFIG[random] = "--with-random=${RANDOM},--without-random"
44PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" 49PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump"
45PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," 50PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp,"
46PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," 51PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,"
47PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," 52PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp,"
48PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl"
49PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" 53PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss"
50PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," 54PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
51PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," 55PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"