From patchwork Thu Mar 5 15:32:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal Eberhard via B4 Relay X-Patchwork-Id: 82589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69274F33A9F for ; Thu, 5 Mar 2026 15:32:28 +0000 (UTC) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.46976.1772724741187335646 for ; Thu, 05 Mar 2026 07:32:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VqOjhjTz; spf=pass (domain: kernel.org, ip: 172.105.4.254, mailfrom: devnull+pascal.eberhard.se.com@kernel.org) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 38A2D61340; Thu, 5 Mar 2026 15:32:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id E0AADC2BC87; Thu, 5 Mar 2026 15:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772724739; bh=FxrKfoS+ixJt0y0yayYTPGhZyuEtE5qtqcYMNHhGq18=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=VqOjhjTzCbDUGbey+C4sL0XA4jdgQ3vtotP0xn/OKuPhkbDAo6HCDqUEzLq8i3kLn HSNhZMwTLQF0txuB1nNSV3jRpyA/PrAxw4KCOHn3xWrH2AG4GBVroTmem4z7y2w7Gr 2gN2br1T3yKKg0Nmhri1pEwFOIHZxBGzhPQgGOCsWGwnt5Rclo945i0dloZaPwg2zl J0cKu3OFQrDWUyxWRy85BLcQmX4+SwqijJHRQzGLMMHqp+wnn8J0s3UxxNGnaPwU19 YH9Yl+tVn5cPccQ8iFa+ii0Sd/WQP4daJ667/iFlt9Vk7f7KKGk2TgpfoBOdV9ZbeX vfwr6g/lC8sew== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4748F33A92; Thu, 5 Mar 2026 15:32:19 +0000 (UTC) From: Pascal Eberhard via B4 Relay Date: Thu, 05 Mar 2026 16:32:14 +0100 Subject: [PATCH 1/4] fetch2: add curl method to fetch web content MIME-Version: 1.0 Message-Id: <20260305-add_alt_fetch_method_curl-v1-1-0d0220e5fa59@se.com> References: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> In-Reply-To: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> To: bitbake-devel@lists.openembedded.org Cc: Pascal Eberhard X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772724738; l=7328; i=pascal.eberhard@se.com; s=20260304; h=from:subject:message-id; bh=6SdmvTHBkNPWmwuu/UBdWIerEVPkSkIo+7UJlD9w77s=; b=j4HciAgx+kjH00XWyHDxf8jX10qr3t5I/VhKpxPszu61E+LLvA5KZGjvnBjd8G3KJUgVy24qr Tz6u9/7BDE0CUAJgzRBDKPhMev+QAroEh20hafX31n1TC1cKgA+XnLn X-Developer-Key: i=pascal.eberhard@se.com; a=ed25519; pk=J7TbFctjt1RVuN5K0juhf/w1E9bAfSeoQ/JG1vV9mWg= X-Endpoint-Received: by B4 Relay for pascal.eberhard@se.com/20260304 with auth_id=661 X-Original-From: Pascal Eberhard Reply-To: pascal.eberhard@se.com List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 05 Mar 2026 15:32:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/19113 From: Pascal Eberhard curl fetch method is an alternative fetch method for web downloads. It is based on curl cmdline tool and provides the same http, https, ftp and ftps protocols as wget. It supports some new features as well such as hostname resolution by the proxy when using SOCKS5 proxy. Signed-off-by: Pascal Eberhard --- lib/bb/fetch2/curl.py | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/lib/bb/fetch2/curl.py b/lib/bb/fetch2/curl.py new file mode 100644 index 000000000..250805233 --- /dev/null +++ b/lib/bb/fetch2/curl.py @@ -0,0 +1,162 @@ +""" +BitBake 'Fetch' implementations for web downloads based on curl. + +curl fetch method is an alternative to existing wget method and can be enabled +by setting bitbake variable: + BB_FETCH_METHOD_HTTP = "curl" + +curl fetch method provides new features such as hostname resolution by the +proxy itself when using SOCKS5 proxy. It can be set with environment variable: + all_proxy="socks5h://..."" +""" + +# Copyright (C) 2026, Schneider Electric +# +# SPDX-License-Identifier: GPL-2.0-only +# +# Based on the wget fetcher method, Copyright 2003 Holger Schurig + +import os +import re +import shlex +import tempfile + +import bb +import bb.fetch2 +import bb.progress +import bb.utils +from bb.data_smart import DataSmart +from bb.fetch2 import FetchData, FetchError, logger, runfetchcmd +from bb.fetch2.wget import Wget + + +class CurlProgressHandler(bb.progress.LineFilterProgressHandler): + """ + Extract progress information from curl commandline output. + Note: relies on --progress-bar being specified on the curl command line. + """ + + def __init__(self, d: DataSmart): + super(CurlProgressHandler, self).__init__(d) + # Send an initial progress event so the bar gets shown + self._fire_progress(0) + + def writeline(self, line: str): + matches = re.findall(r' ([\d]+)\.\d%', line) + if matches: + progress = int(matches[0]) + self.update(progress) + return False + return True + + +class Curl(Wget): + """ + Class to fetch urls via curl cmdline tool. + The code not related to the cmdline is the same between wget and curl. + Curl class inherits Wget class to avoid code duplication. + """ + + def is_enabled(self, d) -> bool: + """ + curl method is enabled when BB_FETCH_METHOD_HTTP = "curl" only. + """ + method_http: str = d.getVar("BB_FETCH_METHOD_HTTP") + return method_http == "curl" + + def supports(self, ud: FetchData, d: DataSmart) -> bool: + """ + Check if a given url can be fetched with curl. + """ + if not self.is_enabled(d): + return False + if ud.type not in ['http', 'https', 'ftp', 'ftps']: + return False + logger.debug2("Fetch method 'curl' enabled") + return True + + def urldata_init(self, ud: FetchData, d: DataSmart): + if 'protocol' in ud.parm: + if ud.parm['protocol'] == 'git': + raise bb.fetch2.ParameterError("Invalid protocol - if you wish to fetch from a git repository using http, you need to instead use the git:// prefix with protocol=http", ud.url) + + if 'downloadfilename' in ud.parm: + ud.basename: str = ud.parm['downloadfilename'] + else: + ud.basename: str = os.path.basename(ud.path) + + ud.localfile = ud.basename + if not ud.localfile: + ud.localfile = ud.host + ud.path.replace("/", ".") + + # --retry 1: equivalent to --tries=2 of wget. + # --speed-limit 1 --speed-time 100 --connect-timeout 100: equivalent to --timeout=100 option of wget. + # --location: redo request on new location when a page as moved, indicated with 3xx response code. + # --fail: fails with exit code when server generates HTML error rather than writing HTML error to output. + self.basecmd: str = d.getVar("FETCHCMD_curl") or "/usr/bin/env curl --retry 1 --speed-limit 1 --speed-time 100 --connect-timeout 100 --location --fail" + + if ud.type == 'ftp' or ud.type == 'ftps': + self.basecmd += " --ftp-pasv" + + if not self.check_certs(d): + self.basecmd += " --insecure" + + def _runcurl(self, ud: FetchData, d: DataSmart, command: str, quiet: bool, workdir: str | None = None): + progresshandler = CurlProgressHandler(d) + + logger.debug2("Fetching %s using command '%s'" % (ud.url, command)) + bb.fetch2.check_network_access(d, command, ud.url) + runfetchcmd(command + " --progress-bar", d, quiet, log=progresshandler, workdir=workdir) + + def download(self, ud: FetchData, d: DataSmart): + """Fetch urls""" + fetchcmd: str = self.basecmd + dldir: str = os.path.realpath(d.getVar("DL_DIR")) + localpath: str = os.path.join(dldir, ud.localfile) + ".tmp" + bb.utils.mkdirhier(os.path.dirname(localpath)) + fetchcmd += " --output %s" % shlex.quote(localpath) + + if ud.user and ud.pswd: + fetchcmd += " --anyauth" + if ud.parm.get("redirectauth", "1") == "1": + fetchcmd += f" --user={ud.user}:{ud.pswd}" + + uri: str = ud.url.split(";")[0] + fetchcmd += f" --continue-at - '{uri}'" + + self._runcurl(ud, d, fetchcmd, False) + + # Sanity check since curl can pretend it succeed when it didn't + # Also, this used to happen if sourceforge sent us to the mirror page + if not os.path.exists(localpath): + raise FetchError(f"The fetch command returned success for url {uri} but {localpath} doesn't exist?!", uri) + + if os.path.getsize(localpath) == 0: + os.remove(localpath) + raise FetchError(f"The fetch of {uri} resulted in a zero size file?! Deleting and failing since this isn't right.", uri) + + # Try and verify any checksum now, meaning if it isn't correct, we don't remove the + # original file, which might be a race (imagine two recipes referencing the same + # source, one with an incorrect checksum) + bb.fetch2.verify_checksum(ud, d, localpath=localpath, fatal_nochecksum=False) + + # Remove the ".tmp" and move the file into position atomically + # Our lock prevents multiple writers but mirroring code may grab incomplete files + os.rename(localpath, localpath[:-4]) + + return True + + def _fetch_index(self, uri: str, ud: FetchData, d: DataSmart): + """ + Run fetch checkstatus to get directory information + """ + with tempfile.TemporaryDirectory(prefix="curl-index-") as workdir, tempfile.NamedTemporaryFile(dir=workdir, prefix="curl-listing-") as f: + fetchcmd: str = self.basecmd + fetchcmd += f" --output {f.name} '{uri}'" + try: + self._runcurl(ud, d, fetchcmd, True, workdir=workdir) + fetchresult = f.read() + except bb.fetch2.BBFetchException: + fetchresult = "" + + return fetchresult From patchwork Thu Mar 5 15:32:15 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal Eberhard via B4 Relay X-Patchwork-Id: 82588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0605F3D300 for ; Thu, 5 Mar 2026 15:32:28 +0000 (UTC) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.46977.1772724741209967994 for ; Thu, 05 Mar 2026 07:32:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uusv3TNQ; spf=pass (domain: kernel.org, ip: 172.105.4.254, mailfrom: devnull+pascal.eberhard.se.com@kernel.org) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 4521661344; Thu, 5 Mar 2026 15:32:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id EE2BBC19423; Thu, 5 Mar 2026 15:32:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772724740; bh=kJPkb8kjs+qAATwbnBMiapdAUb7uPdzbqBSdLN+Oq60=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=uusv3TNQYTT56/AYShg/WikwMhAEa93/Y6q6tY0wGOELPxqDnlmauZgcg4cXjdZzI H5U9niO+1BZQMQSmDBZkrPA2t93h9IENpqU2tH0wQOVi/xnxqXXaXkhZ6kWO5nGWcB UzHVkdp/NWBae5pl9KNyefvfnE03EF8ZnhS/9WOXW2rSF3RN9yZmiqqtjOPeVgE8/0 EO6fDJ7TleVSE0+dykrnZsBY0WuB75TD+jDfSHzOu5Bxgl22ymfmPnsPg5ZHJY05Tb bZxb8Q5IVnF6P8pZPnGY9ZDcO/PF/3k5BT9rXgs6kZSEpqLE+4YhME7tQ26yFkxfgA aunhUVKGrd44A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E244DF33A88; Thu, 5 Mar 2026 15:32:19 +0000 (UTC) From: Pascal Eberhard via B4 Relay Date: Thu, 05 Mar 2026 16:32:15 +0100 Subject: [PATCH 2/4] fetch2: make curl method activable with BB_FETCH_METHOD_HTTP MIME-Version: 1.0 Message-Id: <20260305-add_alt_fetch_method_curl-v1-2-0d0220e5fa59@se.com> References: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> In-Reply-To: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> To: bitbake-devel@lists.openembedded.org Cc: Pascal Eberhard X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772724738; l=1806; i=pascal.eberhard@se.com; s=20260304; h=from:subject:message-id; bh=64aFNHzuzQvTD39bZT3zcb0N4XDTAFGjqhXZfbW5M2o=; b=i7tXCKaj5xjasi+70J1x7rcqy7x8uJ7BbdQXlQ03wode0lgSlsZPvgHjlk9QXdEuFUZINaAf6 GcwLaov3GHwC9s3WIJhnEuzyo+hx8OsLmMWyHkrjCe/0LGn/TC9q96W X-Developer-Key: i=pascal.eberhard@se.com; a=ed25519; pk=J7TbFctjt1RVuN5K0juhf/w1E9bAfSeoQ/JG1vV9mWg= X-Endpoint-Received: by B4 Relay for pascal.eberhard@se.com/20260304 with auth_id=661 X-Original-From: Pascal Eberhard Reply-To: pascal.eberhard@se.com List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 05 Mar 2026 15:32:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/19115 From: Pascal Eberhard wget is the default fetch method. curl fetch method can be activated by setting bitbake variable: BB_FETCH_METHOD_HTTP = "curl" Signed-off-by: Pascal Eberhard --- lib/bb/fetch2/__init__.py | 2 ++ lib/bb/fetch2/wget.py | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index aaefd8602..dc1158b38 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -2107,6 +2107,7 @@ from . import gitannex from . import local from . import svn from . import wget +from . import curl from . import ssh from . import sftp from . import s3 @@ -2123,6 +2124,7 @@ from . import gomod methods.append(local.Local()) methods.append(wget.Wget()) +methods.append(curl.Curl()) methods.append(svn.Svn()) methods.append(git.Git()) methods.append(gitsm.GitSM()) diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index 4e3505599..3b1993f29 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -60,10 +60,20 @@ class Wget(FetchMethod): """ return (d.getVar("BB_CHECK_SSL_CERTS") or "1") != "0" + def is_enabled(self, d): + """ + wget method is enabled when BB_FETCH_METHOD_HTTP = "wget" or by default + when BB_FETCH_METHOD_HTTP variable is not set. + """ + method_http: str = d.getVar("BB_FETCH_METHOD_HTTP") or "wget" + return method_http == "wget" + def supports(self, ud, d): """ Check to see if a given url can be fetched with wget. """ + if not self.is_enabled(d): + return False return ud.type in ['http', 'https', 'ftp', 'ftps'] def recommends_checksum(self, urldata): From patchwork Thu Mar 5 15:32:16 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal Eberhard via B4 Relay X-Patchwork-Id: 82586 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0199AF33A96 for ; Thu, 5 Mar 2026 15:32:27 +0000 (UTC) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.46942.1772724741212391441 for ; Thu, 05 Mar 2026 07:32:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rzMK4+NV; spf=pass (domain: kernel.org, ip: 172.105.4.254, mailfrom: devnull+pascal.eberhard.se.com@kernel.org) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 526A461420; Thu, 5 Mar 2026 15:32:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 04058C2BCAF; Thu, 5 Mar 2026 15:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772724740; bh=fM0XKZyQ6asKTKoIICxhU8YNDQTj30aIqR/D4+BtmqA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=rzMK4+NV3tJeMUH7BvTP9RAotvYzWjDBHFChlGy+kXnd8MYmE6mfhxjIrL7p8ZPkC /Sq9b1pkG5pk5unqWTDC+kr4eJgLmywoT7o61oC9q4ARBdgi3AuPlQ+Ux5CTni0rxl QHTuxBJYOP5AGfGwmWELu+FQntxteTtubI2WnYnhgxdj59hXzXmV8otSPUZv8E7pN2 F6TNR5qRjLccMzrrni3nDk/JpDtlgD3QYZbqf8HEnRQYZa+mp2YZth34hChavNtM12 aYDCXAP0Yxg61ey/NJ+N3ihVrulTBh9dMHdFSLXF+OAqaXqkeZ3X+WA43y5obPbsWh K32/j7lXpgOSA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F00F7F33A93; Thu, 5 Mar 2026 15:32:19 +0000 (UTC) From: Pascal Eberhard via B4 Relay Date: Thu, 05 Mar 2026 16:32:16 +0100 Subject: [PATCH 3/4] lib/tests/fetch2: add tests for curl method MIME-Version: 1.0 Message-Id: <20260305-add_alt_fetch_method_curl-v1-3-0d0220e5fa59@se.com> References: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> In-Reply-To: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> To: bitbake-devel@lists.openembedded.org Cc: Pascal Eberhard X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772724738; l=5017; i=pascal.eberhard@se.com; s=20260304; h=from:subject:message-id; bh=UaiA9e2FKgpaMtTOgq8g3apGKeVH2UE6u0BEkf4ti6I=; b=LWVdmEF5vO47Le3Uoh4IzaJLH1WRTHoGSglqElCbF3nJZu5CcOm2dc1HMREguk2M39QMjxYpL zqEBnEWdtMgB/aK+3J2eAmfqdsS7Iqyc8dmBn5vmgWnWJCyGjodxBco X-Developer-Key: i=pascal.eberhard@se.com; a=ed25519; pk=J7TbFctjt1RVuN5K0juhf/w1E9bAfSeoQ/JG1vV9mWg= X-Endpoint-Received: by B4 Relay for pascal.eberhard@se.com/20260304 with auth_id=661 X-Original-From: Pascal Eberhard Reply-To: pascal.eberhard@se.com List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 05 Mar 2026 15:32:26 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/19112 From: Pascal Eberhard Duplicate wget fetch method test cases to test curl fetch method. Signed-off-by: Pascal Eberhard --- lib/bb/tests/fetch.py | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 74eb73472..5c587d7b4 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -1550,6 +1550,7 @@ class FetchLatestVersionTest(FetcherTest): url = "http://127.0.0.1:%s/%s" % (port, data.path) ud = bb.fetch2.FetchData(url, self.d) + self.assertEqual(ud.method.__class__.__name__, "Wget") pupver = ud.method.latest_versionstring(ud, self.d) verstring = pupver[0] self.assertTrue(verstring, msg="Could not find upstream version for %s" % data.pn) @@ -1558,6 +1559,35 @@ class FetchLatestVersionTest(FetcherTest): finally: server.stop() + def test_curl_latest_versionstring(self): + self.d.setVar("BB_FETCH_METHOD_HTTP", "curl") + testdata = os.path.dirname(os.path.abspath(__file__)) + "/fetch-testdata" + server = HTTPService(testdata, host="127.0.0.1") + server.start() + port = server.port + try: + for data, v in self.test_wget_uris.items(): + with self.subTest(pn=data.pn): + self.d.setVar("PN", data.pn) + self.d.setVar("PV", data.pv) + if data.check_uri: + checkuri = "http://127.0.0.1:%s/%s" % (port, data.check_uri) + self.d.setVar("UPSTREAM_CHECK_URI", checkuri) + if data.check_regex: + self.d.setVar("UPSTREAM_CHECK_REGEX", data.check_regex) + + url = "http://127.0.0.1:%s/%s" % (port, data.path) + ud = bb.fetch2.FetchData(url, self.d) + self.assertEqual(ud.method.__class__.__name__, "Curl") + pupver = ud.method.latest_versionstring(ud, self.d) + verstring = pupver[0] + self.assertTrue(verstring, msg="Could not find upstream version for %s" % data.pn) + r = bb.utils.vercmp_string(v, verstring) + self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (data.pn, v, verstring)) + finally: + server.stop() + self.d.delVar("BB_FETCH_METHOD_HTTP") + @skipIfNoNetwork() def test_crate_latest_versionstring(self): for k, v in self.test_crate_uris.items(): @@ -1590,6 +1620,7 @@ class FetchCheckStatusTest(FetcherTest): with self.subTest(url=u): ud = fetch.ud[u] m = ud.method + self.assertEqual(ud.method.__class__.__name__, "Wget") ret = m.checkstatus(fetch, ud, self.d) self.assertTrue(ret, msg="URI %s, can't check status" % (u)) @@ -1605,10 +1636,47 @@ class FetchCheckStatusTest(FetcherTest): with self.subTest(url=u): ud = fetch.ud[u] m = ud.method + self.assertEqual(ud.method.__class__.__name__, "Wget") + ret = m.checkstatus(fetch, ud, self.d) + self.assertTrue(ret, msg="URI %s, can't check status" % (u)) + + connection_cache.close_connections() + + @skipIfNoNetwork() + def test_curl_checkstatus(self): + self.d.setVar("BB_FETCH_METHOD_HTTP", "curl") + + fetch = bb.fetch2.Fetch(self.test_wget_uris, self.d) + for u in self.test_wget_uris: + with self.subTest(url=u): + ud = fetch.ud[u] + m = ud.method + self.assertEqual(ud.method.__class__.__name__, "Curl") + ret = m.checkstatus(fetch, ud, self.d) + self.assertTrue(ret, msg="URI %s, can't check status" % (u)) + + self.d.delVar("BB_FETCH_METHOD_HTTP") + + @skipIfNoNetwork() + def test_curl_checkstatus_connection_cache(self): + from bb.fetch2 import FetchConnectionCache + + self.d.setVar("BB_FETCH_METHOD_HTTP", "curl") + + connection_cache = FetchConnectionCache() + fetch = bb.fetch2.Fetch(self.test_wget_uris, self.d, + connection_cache = connection_cache) + + for u in self.test_wget_uris: + with self.subTest(url=u): + ud = fetch.ud[u] + m = ud.method + self.assertEqual(ud.method.__class__.__name__, "Curl") ret = m.checkstatus(fetch, ud, self.d) self.assertTrue(ret, msg="URI %s, can't check status" % (u)) connection_cache.close_connections() + self.d.delVar("BB_FETCH_METHOD_HTTP") class GitMakeShallowTest(FetcherTest): From patchwork Thu Mar 5 15:32:17 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal Eberhard via B4 Relay X-Patchwork-Id: 82587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3247F33A9D for ; Thu, 5 Mar 2026 15:32:27 +0000 (UTC) Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.46940.1772724741185458018 for ; Thu, 05 Mar 2026 07:32:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZVDBLmph; spf=pass (domain: kernel.org, ip: 172.105.4.254, mailfrom: devnull+pascal.eberhard.se.com@kernel.org) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 5FE0461421; Thu, 5 Mar 2026 15:32:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 11FCFC2BC9E; Thu, 5 Mar 2026 15:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772724740; bh=cvbiLheeJnhWQf/i0mAc32p4j272BkKF0rHKq4OAZSo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ZVDBLmphrcflcZo+q38HmAg8qopETTPQ6/+4AR1zkj6SiOULpo06Jc0sUmn6pD3iJ 4plrHhjOZd83RCKmyg/thbmLOrUPZqqu/hV+Ly26V3L4uBXLjOI+Fxgq+aq+MurvIG +tNVsJTh9MLxlg30ycThWQGMU3R5N5O16XrhbOBT3kx/FVPbpX1e/KHxG4Nzawhytt poxmBNtRorwnHhW8qaOoHMcyANW6CcmdqvV2UCwPrrN8zJhkGbaPQdktMi2jG0GNle t+FPraeCJtrBzyaoJHNAeNb/Byg53YLed0G+fOhx1sI0ofAARWmYSydleQO7zQAQOO O1kD45q/8Ebtg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09927F33A74; Thu, 5 Mar 2026 15:32:20 +0000 (UTC) From: Pascal Eberhard via B4 Relay Date: Thu, 05 Mar 2026 16:32:17 +0100 Subject: [PATCH 4/4] doc: bitbake-user-manual-ref-variables: describe BB_FETCH_METHOD_HTTP variable MIME-Version: 1.0 Message-Id: <20260305-add_alt_fetch_method_curl-v1-4-0d0220e5fa59@se.com> References: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> In-Reply-To: <20260305-add_alt_fetch_method_curl-v1-0-0d0220e5fa59@se.com> To: bitbake-devel@lists.openembedded.org Cc: Pascal Eberhard X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772724738; l=1168; i=pascal.eberhard@se.com; s=20260304; h=from:subject:message-id; bh=mMN0eDTcP33G0a41mnOnUsgTrlLpjDXr5F9CTc4gENE=; b=3YjjWTMx3mANJIpSQ3N7C9AFZ0pigBV1/zGFUDpdMnAmlPKaLJHCKCfUOjjcq3UyunLVWA08e mICrzrkBdgZCJwDVJI38STe2y0Pfi+9wh1C35j4K/SF9g1PGaCR26b4 X-Developer-Key: i=pascal.eberhard@se.com; a=ed25519; pk=J7TbFctjt1RVuN5K0juhf/w1E9bAfSeoQ/JG1vV9mWg= X-Endpoint-Received: by B4 Relay for pascal.eberhard@se.com/20260304 with auth_id=661 X-Original-From: Pascal Eberhard Reply-To: pascal.eberhard@se.com List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 05 Mar 2026 15:32:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/19111 From: Pascal Eberhard add BB_FETCH_METHOD_HTTP variable to select between wget and curl method for http, https, ftp, ftps protocols. Signed-off-by: Pascal Eberhard --- doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst index 06bd53619..c459ed3af 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst @@ -311,6 +311,11 @@ overview of their function and contents. search the main :term:`SRC_URI` or :term:`MIRRORS`. + :term:`BB_FETCH_METHOD_HTTP` + When set to "curl", cause BitBake's fetcher to use curl method for + downloading web artifacts via http, https, ftp or ftps. + When not set (default) or set to "wget", wget method is used. + :term:`BB_FILENAME` Contains the filename of the recipe that owns the currently running task. For example, if the ``do_fetch`` task that resides in the