summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/curl/curl/no-test-timeout.patch11
-rw-r--r--meta/recipes-support/curl/curl_8.7.1.bb (renamed from meta/recipes-support/curl/curl_8.6.0.bb)2
2 files changed, 10 insertions, 3 deletions
diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch
index b4cfe716db..7122b6f043 100644
--- a/meta/recipes-support/curl/curl/no-test-timeout.patch
+++ b/meta/recipes-support/curl/curl/no-test-timeout.patch
@@ -1,10 +1,17 @@
1Set the max-time timeout to 600 so the timeout is 10 minutes instead of 13 seconds. 1From 42cddb52e821cfc2f09f1974742714e5f2f1856e Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Fri, 15 Mar 2024 14:37:37 +0000
4Subject: [PATCH] Set the max-time timeout to 600 so the timeout is 10 minutes
5 instead of 13 seconds.
2 6
3Upstream-Status: Inappropriate 7Upstream-Status: Inappropriate
4Signed-off-by: Ross Burton <ross.burton@arm.com> 8Signed-off-by: Ross Burton <ross.burton@arm.com>
9---
10 tests/servers.pm | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
5 12
6diff --git a/tests/servers.pm b/tests/servers.pm 13diff --git a/tests/servers.pm b/tests/servers.pm
7index d4472d509..aeab62c47 100644 14index d4472d5..9999938 100644
8--- a/tests/servers.pm 15--- a/tests/servers.pm
9+++ b/tests/servers.pm 16+++ b/tests/servers.pm
10@@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string 17@@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string
diff --git a/meta/recipes-support/curl/curl_8.6.0.bb b/meta/recipes-support/curl/curl_8.7.1.bb
index 49ba0cb4a7..c6654bbad6 100644
--- a/meta/recipes-support/curl/curl_8.6.0.bb
+++ b/meta/recipes-support/curl/curl_8.7.1.bb
@@ -15,7 +15,7 @@ SRC_URI = " \
15 file://disable-tests \ 15 file://disable-tests \
16 file://no-test-timeout.patch \ 16 file://no-test-timeout.patch \
17" 17"
18SRC_URI[sha256sum] = "3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15" 18SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"
19 19
20# Curl has used many names over the years... 20# Curl has used many names over the years...
21CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" 21CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl"