From 8c22ff0d8b70d9b12f0487ef696a7e915b9e3173 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Nov 2025 13:31:53 +0000 Subject: The poky repository master branch is no longer being updated. You can either: a) switch to individual clones of bitbake, openembedded-core, meta-yocto and yocto-docs b) use the new bitbake-setup You can find information about either approach in our documentation: https://docs.yoctoproject.org/ Note that "poky" the distro setting is still available in meta-yocto as before and we continue to use and maintain that. Long live Poky! Some further information on the background of this change can be found in: https://lists.openembedded.org/g/openembedded-architecture/message/2179 Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl/disable-tests | 0 .../curl/curl/environment.d-curl.sh | 19 --- .../curl/curl/no-test-timeout.patch | 25 --- meta/recipes-support/curl/curl/run-ptest | 19 --- meta/recipes-support/curl/curl_8.16.0.bb | 171 --------------------- 5 files changed, 234 deletions(-) delete mode 100644 meta/recipes-support/curl/curl/disable-tests delete mode 100644 meta/recipes-support/curl/curl/environment.d-curl.sh delete mode 100644 meta/recipes-support/curl/curl/no-test-timeout.patch delete mode 100644 meta/recipes-support/curl/curl/run-ptest delete mode 100644 meta/recipes-support/curl/curl_8.16.0.bb (limited to 'meta/recipes-support/curl') diff --git a/meta/recipes-support/curl/curl/disable-tests b/meta/recipes-support/curl/curl/disable-tests deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/meta/recipes-support/curl/curl/environment.d-curl.sh b/meta/recipes-support/curl/curl/environment.d-curl.sh deleted file mode 100644 index 581108ef35..0000000000 --- a/meta/recipes-support/curl/curl/environment.d-curl.sh +++ /dev/null @@ -1,19 +0,0 @@ -# Respect host env CURL_CA_BUNDLE/CURL_CA_PATH first, then auto-detected host cert, then cert in buildtools -# CAFILE/CAPATH is auto-deteced when source buildtools -if [ -z "${CURL_CA_PATH:-}" ]; then - if [ -n "${CAFILE:-}" ];then - export CURL_CA_BUNDLE="$CAFILE" - elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export CURL_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" - fi -fi - -if [ -z "${CURL_CA_PATH:-}" ]; then - if [ -n "${CAPATH:-}" ];then - export CURL_CA_PATH="$CAPATH" - elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then - export CURL_CA_PATH="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs" - fi -fi - -export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} CURL_CA_BUNDLE CURL_CA_PATH" diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch deleted file mode 100644 index 5b901a6fe9..0000000000 --- a/meta/recipes-support/curl/curl/no-test-timeout.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 42cddb52e821cfc2f09f1974742714e5f2f1856e Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 15 Mar 2024 14:37:37 +0000 -Subject: [PATCH] Set the max-time timeout to 600 so the timeout is 10 minutes - instead of 13 seconds. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton ---- - tests/servers.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/servers.pm b/tests/servers.pm -index d4472d5..9999938 100644 ---- a/tests/servers.pm -+++ b/tests/servers.pm -@@ -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 --my $server_response_maxtime=13; -+my $server_response_maxtime=600; - my $httptlssrv = find_httptlssrv(); - my %run; # running server - my %runcert; # cert file currently in use by an ssl running server diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest deleted file mode 100644 index 597cf92dbb..0000000000 --- a/meta/recipes-support/curl/curl/run-ptest +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -cd tests - -# Run all tests, don't stop on first failure -# Don't use valgrind if it is found -# Use automake-style output -# Run four tests in parallel -# Print log output on failure - -# Don't run the flaky or timing dependent tests -# Until https://github.com/curl/curl/issues/13350 is resolved, don't run FTP tests -# We don't enable --libcurl -# Don't assume curl-config exists -# We don't have the source tree -./runtests.pl \ - -a -c curl -vc curl -n -am -j4 -p \ - !flaky !timing-dependent !FTP \ - !--libcurl !curl-config !source\ analysis !checksrc !documentation diff --git a/meta/recipes-support/curl/curl_8.16.0.bb b/meta/recipes-support/curl/curl_8.16.0.bb deleted file mode 100644 index c226670357..0000000000 --- a/meta/recipes-support/curl/curl_8.16.0.bb +++ /dev/null @@ -1,171 +0,0 @@ -SUMMARY = "Command line tool and library for client-side URL transfers" -DESCRIPTION = "It uses URL syntax to transfer data to and from servers. \ -curl is a widely used because of its ability to be flexible and complete \ -complex tasks. For example, you can use curl for things like user authentication, \ -HTTP post, SSL connections, proxy support, FTP uploads, and more!" -HOMEPAGE = "https://curl.se/" -BUGTRACKER = "https://github.com/curl/curl/issues" -SECTION = "console/network" -LICENSE = "curl" -LIC_FILES_CHKSUM = "file://COPYING;md5=72f4e9890e99e68d77b7e40703d789b8" - -SRC_URI = " \ - https://curl.se/download/${BP}.tar.xz \ - file://run-ptest \ - file://disable-tests \ - file://no-test-timeout.patch \ -" - -SRC_URI:append:class-nativesdk = " \ - file://environment.d-curl.sh \ -" - -SRC_URI[sha256sum] = "40c8cddbcb6cc6251c03dea423a472a6cea4037be654ba5cf5dec6eb2d22ff1d" - -# Curl has used many names over the years... -CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" -CVE_STATUS[CVE-2024-32928] = "ignored: CURLOPT_SSL_VERIFYPEER was disabled on google cloud services causing a potential man in the middle attack" - -inherit autotools pkgconfig binconfig multilib_header ptest - -COMMON_PACKAGECONFIG = "basic-auth bearer-auth digest-auth ipfs negotiate-auth openssl proxy threaded-resolver verbose zlib" -PACKAGECONFIG ??= "${COMMON_PACKAGECONFIG} ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} aws libidn" -PACKAGECONFIG:class-native = "${COMMON_PACKAGECONFIG} ipv6" -PACKAGECONFIG:class-nativesdk = "${COMMON_PACKAGECONFIG} ipv6" - -# 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" -PACKAGECONFIG[aws] = "--enable-aws,--disable-aws" -PACKAGECONFIG[basic-auth] = "--enable-basic-auth,--disable-basic-auth" -PACKAGECONFIG[bearer-auth] = "--enable-bearer-auth,--disable-bearer-auth" -PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" -PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" -# Don't use this in production -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," -PACKAGECONFIG[digest-auth] = "--enable-digest-auth,--disable-digest-auth" -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," -PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[ipfs] = "--enable-ipfs,--disable-ipfs," -PACKAGECONFIG[kerberos-auth] = "--enable-kerberos-auth,--disable-kerberos-auth" -PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap,openldap" -PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps,openldap" -PACKAGECONFIG[libgsasl] = "--with-libgsasl,--without-libgsasl,libgsasl" -PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" -PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" -PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" -PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," -PACKAGECONFIG[negotiate-auth] = "--enable-negotiate-auth,--disable-negotiate-auth" -PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" -PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," -PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," -PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" -PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," -PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," -PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," -PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," -PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" -PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" -PACKAGECONFIG[websockets] = "--enable-websockets,--disable-websockets" -PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" - -EXTRA_OECONF = " \ - --disable-libcurl-option \ - --without-libpsl \ - --enable-optimize \ - ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ - WATT_ROOT=${STAGING_DIR_TARGET}${prefix} \ -" -EXTRA_OECONF:append:class-target = " \ - --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ -" - -fix_absolute_paths () { - # cleanup buildpaths from curl-config - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's|${@" ".join(d.getVar("DEBUG_PREFIX_MAP").split())}||g' \ - ${D}${bindir}/curl-config -} - -do_install:append:class-target() { - fix_absolute_paths -} - -do_install:append:class-nativesdk() { - fix_absolute_paths - - mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d - install -m 644 ${UNPACKDIR}/environment.d-curl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/curl.sh -} - -do_compile_ptest() { - oe_runmake -C ${B}/tests -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp ${S}/tests/*.p[lmy] ${D}${PTEST_PATH}/tests/ - - install -d ${D}${PTEST_PATH}/tests/libtest - for name in $(makefile-getvar ${B}/tests/libtest/Makefile noinst_PROGRAMS noinst_LTLIBRARIES); do - ${B}/libtool --mode=install install ${B}/tests/libtest/$name ${D}${PTEST_PATH}/tests/libtest - done - rm -f ${D}${PTEST_PATH}/tests/libtest/libhostname.la - - install -d ${D}${PTEST_PATH}/tests/server - for name in $(makefile-getvar ${B}/tests/server/Makefile noinst_PROGRAMS); do - ${B}/libtool --mode=install install ${B}/tests/server/$name ${D}${PTEST_PATH}/tests/server - done - - install -d ${D}${PTEST_PATH}/src - install -m 755 ${B}/src/curlinfo ${D}${PTEST_PATH}/src - - cp -r ${S}/tests/data ${D}${PTEST_PATH}/tests/ - - # More tests that we disable for automated QA as they're not reliable - cat ${UNPACKDIR}/disable-tests >>${D}${PTEST_PATH}/tests/data/DISABLED -} - -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' openssl-native', '', d)}" - -RDEPENDS:${PN}-ptest += " \ - locale-base-en-us \ - perl-module-b \ - perl-module-base \ - perl-module-cwd \ - perl-module-digest \ - perl-module-digest-md5 \ - perl-module-digest-sha \ - perl-module-file-basename \ - perl-module-file-spec \ - perl-module-file-temp \ - perl-module-i18n-langinfo \ - perl-module-io-socket \ - perl-module-ipc-open2 \ - perl-module-list-util \ - perl-module-memoize \ - perl-module-storable \ - perl-module-time-hires \ -" - -PACKAGES =+ "lib${BPN}" - -FILES:lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS:lib${BPN} += "ca-certificates" - -FILES:${PN} += "${datadir}/zsh" -FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/curl.sh" - -inherit multilib_script -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf