| Message ID | 1744073502-27695-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/15] curl: upgrade 8.12.1 -> 8.13.0 | expand |
On Tue Apr 8, 2025 at 2:51 AM CEST, wangmy via lists.openembedded.org wrote: > From: Wang Mingyu <wangmy@fujitsu.com> > > no-test-timeout.patch > refreshed for 8.13.0 > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- Hi Wang, Thanks for your patch. I believe the curl update is breaking nativesdk-cmake on the autobuilder: ERROR: nativesdk-cmake-3.31.6-r0 do_compile: Execution of '/srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/temp/run.do_compile.1695358' failed with exit code 1 | In file included from /srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/cmake-3.31.6/Utilities/cm3p/curl/curl.h:8, | from /srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.h:12, | from /srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:3: | /srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx: In function 'std::string cmCurlSetNETRCOption(CURL*, const std::string&, const std::string&)': | /srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:178:26: error: invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive] | 178 | curl_netrc_level = CURL_NETRC_OPTIONAL; | | ^~~~~~~~~~~~~~~~~~~ | | | | | long int | /srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:180:26: error: invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive] | 180 | curl_netrc_level = CURL_NETRC_REQUIRED; | | ^~~~~~~~~~~~~~~~~~~ | | | | | long int | /srv/pokybuild/yocto-worker/qemuarmv5/build/build/tmp/work/x86_64-nativesdk-pokysdk-linux/nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:182:26: error: invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive] | 182 | curl_netrc_level = CURL_NETRC_IGNORED; | | ^~~~~~~~~~~~~~~~~~ | | | | | long int Can you have a look at this please?
diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch index 677d177302..8f58277bc6 100644 --- a/meta/recipes-support/curl/curl/no-test-timeout.patch +++ b/meta/recipes-support/curl/curl/no-test-timeout.patch @@ -1,4 +1,4 @@ -From 42cddb52e821cfc2f09f1974742714e5f2f1856e Mon Sep 17 00:00:00 2001 +From 239c2f04d0ccb16f9ede473efa58c601e5379f3c Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Fri, 15 Mar 2024 14:37:37 +0000 Subject: [PATCH] Set the max-time timeout to 600 so the timeout is 10 minutes @@ -11,10 +11,10 @@ Signed-off-by: Ross Burton <ross.burton@arm.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/servers.pm b/tests/servers.pm -index d4472d5..9999938 100644 +index a3e5edb..f75df79 100644 --- a/tests/servers.pm +++ b/tests/servers.pm -@@ -123,7 +123,7 @@ my $sshdverstr; # for socks server, ssh daemon version string +@@ -124,7 +124,7 @@ my $sshdverstr; # for socks server, ssh daemon version string my $sshderror; # for socks server, ssh daemon version error my %doesntrun; # servers that don't work, identified by pidfile my %PORT = (nolisten => 47); # port we use for a local non-listening service diff --git a/meta/recipes-support/curl/curl_8.12.1.bb b/meta/recipes-support/curl/curl_8.13.0.bb similarity index 98% rename from meta/recipes-support/curl/curl_8.12.1.bb rename to meta/recipes-support/curl/curl_8.13.0.bb index dd1c89979a..cb2c42baa9 100644 --- a/meta/recipes-support/curl/curl_8.12.1.bb +++ b/meta/recipes-support/curl/curl_8.13.0.bb @@ -15,7 +15,7 @@ SRC_URI = " \ file://disable-tests \ file://no-test-timeout.patch \ " -SRC_URI[sha256sum] = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202" +SRC_URI[sha256sum] = "4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"