summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRob Woolley <rob.woolley@windriver.com>2024-04-09 10:58:58 -0700
committerSteve Sakoman <steve@sakoman.com>2024-10-10 12:01:06 -0700
commit689b521a38d9e04ae9d3debb27223e449de122a5 (patch)
treec7e4560d1bf99a10bc339e5113b8aa65691e10fb /bitbake
parentb61f2dc18a8b928091e4997335be66fa67a5e10d (diff)
downloadpoky-689b521a38d9e04ae9d3debb27223e449de122a5.tar.gz
bitbake: wget: Make wget --passive-ftp option conditional on ftp/ftps
Fedora 40 introduces wget2 as a drop-in replacement for wget. This rewrite does not currently have support for FTP. This causes the wget fetcher to fail complaining about an unrecognized option. Making --passive-ftp conditional based on the protocol used in the SRC_URI limits the scope of the problem. It also gives us an opportunity to build the older wget as a host tool. (Bitbake rev: 477f90f9515cb7cd093920cee5518f662cef2e05) Signed-off-by: Rob Woolley <rob.woolley@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f10e630fd7561746d835a4378e8777e78f56e44a) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/wget.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index b3a3de571a..9bcb0d4b7a 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -88,7 +88,10 @@ class Wget(FetchMethod):
88 if not ud.localfile: 88 if not ud.localfile:
89 ud.localfile = d.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", ".")) 89 ud.localfile = d.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", "."))
90 90
91 self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp" 91 self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30"
92
93 if ud.type == 'ftp' or ud.type == 'ftps':
94 self.basecmd += " --passive-ftp"
92 95
93 if not self.check_certs(d): 96 if not self.check_certs(d):
94 self.basecmd += " --no-check-certificate" 97 self.basecmd += " --no-check-certificate"