Patchwork curl: enable ssl support

login
register
mail settings
Submitter Saul Wold
Date June 8, 2012, 12:59 a.m.
Message ID <1339117150-15442-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/29451/
State New
Headers show

Comments

Saul Wold - June 8, 2012, 12:59 a.m.
This patch enables ssl support for curl to allow git to clone from
https / ssl sites.

[YOCTO #2532]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/curl/curl_7.24.0.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Koen Kooi - June 8, 2012, 7:39 a.m.
Op 8 jun. 2012, om 02:59 heeft Saul Wold het volgende geschreven:

> This patch enables ssl support for curl to allow git to clone from
> https / ssl sites.
> 
> [YOCTO #2532]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-support/curl/curl_7.24.0.bb |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb
> index 12e95c9..f0ae7f1 100644
> --- a/meta/recipes-support/curl/curl_7.24.0.bb
> +++ b/meta/recipes-support/curl/curl_7.24.0.bb
> @@ -5,10 +5,10 @@ SECTION = "console/network"
> LICENSE = "MIT"
> LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
> 
> -DEPENDS = "zlib gnutls"
> +DEPENDS = "zlib gnutls openssl"
> DEPENDS_virtclass-native = "zlib-native"
> DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
> -PR = "r0"
> +PR = "r1"
> 
> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
>            file://noldlibpath.patch \
> @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
> inherit autotools pkgconfig binconfig
> 
> EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
> -                --without-ssl \
> +		--with-ssl \
>                 --without-libssh2 \
> 		--with-random=/dev/urandom \
> 		--without-libidn \

I haven't looked at the complete recipe, but what is the ssl behaviour for the -native and -nativesdk versions?

regards,

Koen
Saul Wold - June 11, 2012, 2:50 p.m.
On 06/08/2012 12:39 AM, Koen Kooi wrote:
>
> Op 8 jun. 2012, om 02:59 heeft Saul Wold het volgende geschreven:
>
>> This patch enables ssl support for curl to allow git to clone from
>> https / ssl sites.
>>
>> [YOCTO #2532]
>>
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>> meta/recipes-support/curl/curl_7.24.0.bb |    6 +++---
>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb
>> index 12e95c9..f0ae7f1 100644
>> --- a/meta/recipes-support/curl/curl_7.24.0.bb
>> +++ b/meta/recipes-support/curl/curl_7.24.0.bb
>> @@ -5,10 +5,10 @@ SECTION = "console/network"
>> LICENSE = "MIT"
>> LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
>>
>> -DEPENDS = "zlib gnutls"
>> +DEPENDS = "zlib gnutls openssl"
>> DEPENDS_virtclass-native = "zlib-native"
>> DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
>> -PR = "r0"
>> +PR = "r1"
>>
>> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
>>             file://noldlibpath.patch \
>> @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
>> inherit autotools pkgconfig binconfig
>>
>> EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
>> -                --without-ssl \
>> +		--with-ssl \
>>                  --without-libssh2 \
>> 		--with-random=/dev/urandom \
>> 		--without-libidn \
>
> I haven't looked at the complete recipe, but what is the ssl behaviour for the -native and -nativesdk versions?
>
Actually it's the -native that needs the ssl behavior, and this adds it 
for all 3 correctly, tested on target as well as -native (I did not 
actually test the -nativesdk, but I will now).

Sau!

> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Koen Kooi - June 11, 2012, 3:19 p.m.
Op 11 jun. 2012, om 09:50 heeft Saul Wold het volgende geschreven:

> On 06/08/2012 12:39 AM, Koen Kooi wrote:
>> 
>> Op 8 jun. 2012, om 02:59 heeft Saul Wold het volgende geschreven:
>> 
>>> This patch enables ssl support for curl to allow git to clone from
>>> https / ssl sites.
>>> 
>>> [YOCTO #2532]
>>> 
>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>> ---
>>> meta/recipes-support/curl/curl_7.24.0.bb |    6 +++---
>>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>> 
>>> diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb
>>> index 12e95c9..f0ae7f1 100644
>>> --- a/meta/recipes-support/curl/curl_7.24.0.bb
>>> +++ b/meta/recipes-support/curl/curl_7.24.0.bb
>>> @@ -5,10 +5,10 @@ SECTION = "console/network"
>>> LICENSE = "MIT"
>>> LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
>>> 
>>> -DEPENDS = "zlib gnutls"
>>> +DEPENDS = "zlib gnutls openssl"
>>> DEPENDS_virtclass-native = "zlib-native"
>>> DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
>>> -PR = "r0"
>>> +PR = "r1"
>>> 
>>> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
>>>            file://noldlibpath.patch \
>>> @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
>>> inherit autotools pkgconfig binconfig
>>> 
>>> EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
>>> -                --without-ssl \
>>> +		--with-ssl \
>>>                 --without-libssh2 \
>>> 		--with-random=/dev/urandom \
>>> 		--without-libidn \
>> 
>> I haven't looked at the complete recipe, but what is the ssl behaviour for the -native and -nativesdk versions?
>> 
> Actually it's the -native that needs the ssl behavior, and this adds it for all 3 correctly, tested on target as well as -native (I did not actually test the -nativesdk, but I will now).

In that case you need to change all the DEPENDS, including the virtclass ones.

regards,

Koen
Saul Wold - June 11, 2012, 10:13 p.m.
On 06/11/2012 08:19 AM, Koen Kooi wrote:
>
> Op 11 jun. 2012, om 09:50 heeft Saul Wold het volgende geschreven:
>
>> On 06/08/2012 12:39 AM, Koen Kooi wrote:
>>>
>>> Op 8 jun. 2012, om 02:59 heeft Saul Wold het volgende geschreven:
>>>
>>>> This patch enables ssl support for curl to allow git to clone from
>>>> https / ssl sites.
>>>>
>>>> [YOCTO #2532]
>>>>
>>>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>>>> ---
>>>> meta/recipes-support/curl/curl_7.24.0.bb |    6 +++---
>>>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb
>>>> index 12e95c9..f0ae7f1 100644
>>>> --- a/meta/recipes-support/curl/curl_7.24.0.bb
>>>> +++ b/meta/recipes-support/curl/curl_7.24.0.bb
>>>> @@ -5,10 +5,10 @@ SECTION = "console/network"
>>>> LICENSE = "MIT"
>>>> LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
>>>>
>>>> -DEPENDS = "zlib gnutls"
>>>> +DEPENDS = "zlib gnutls openssl"
>>>> DEPENDS_virtclass-native = "zlib-native"
>>>> DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
>>>> -PR = "r0"
>>>> +PR = "r1"
>>>>
>>>> SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
>>>>             file://noldlibpath.patch \
>>>> @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
>>>> inherit autotools pkgconfig binconfig
>>>>
>>>> EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
>>>> -                --without-ssl \
>>>> +		--with-ssl \
>>>>                  --without-libssh2 \
>>>> 		--with-random=/dev/urandom \
>>>> 		--without-libidn \
>>>
>>> I haven't looked at the complete recipe, but what is the ssl behaviour for the -native and -nativesdk versions?
>>>
>> Actually it's the -native that needs the ssl behavior, and this adds it for all 3 correctly, tested on target as well as -native (I did not actually test the -nativesdk, but I will now).
>
> In that case you need to change all the DEPENDS, including the virtclass ones.
>
Yes, of course, I missed those and it worked since I already had the 
OpenSSL-native package on my system.

Thanks
	Sau!

> regards,
>
> Koen
>
>
>

Patch

diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb
index 12e95c9..f0ae7f1 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.24.0.bb
@@ -5,10 +5,10 @@  SECTION = "console/network"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
 
-DEPENDS = "zlib gnutls"
+DEPENDS = "zlib gnutls openssl"
 DEPENDS_virtclass-native = "zlib-native"
 DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://noldlibpath.patch \
@@ -20,7 +20,7 @@  SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
 inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-                --without-ssl \
+		--with-ssl \
                 --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \