From 92cad721d764ec28c3570dfe4a80847c3df19453 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 11 Feb 2014 10:54:54 +0100 Subject: curl: fix https certificate problems point CA bundle to /etc/ssl/certs/ca-certificates.crt instead of using the buildhost location, Configure would look at the buildhost and hardcode the bundle location for there into the target. This leads to non-working https support. Also remove the empty and now useless curl-certs packages since it's empty and no ALLOW_EMPTY has been set. Apart from making https work again with curl cmdline this also fixes libcurl which means git can fetch https repos as well instead of erroring out. (From OE-Core rev: 2325c1ee13bc3a8474238e8a6c20b6a3c671bf07) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl_7.34.0.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta/recipes-support/curl') diff --git a/meta/recipes-support/curl/curl_7.34.0.bb b/meta/recipes-support/curl/curl_7.34.0.bb index b49c6e4..aba6649 100644 --- a/meta/recipes-support/curl/curl_7.34.0.bb +++ b/meta/recipes-support/curl/curl_7.34.0.bb @@ -30,6 +30,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ --enable-crypto-auth \ --disable-ldap \ --disable-ldaps \ + --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ ${CURLGNUTLS} \ " @@ -45,13 +46,10 @@ do_install_append() { oe_multilib_header curl/curlbuild.h } -PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" +PACKAGES =+ "libcurl libcurl-dev libcurl-staticdev libcurl-doc" FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "${PN}-certs" +RRECOMMENDS_lib${BPN} += "ca-certificates" FILES_lib${BPN}-dev = "${includedir} \ ${libdir}/lib*.so \ ${libdir}/lib*.la \ -- cgit v1.1