| Message ID | 20250331102726.1965866-1-jhaller.oss@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] bitbake: fetch: Fix BB_FETCH_PREMIRRORONLY for git mirror tarballs | expand |
On Mon, 2025-03-31 at 12:27 +0200, Julian Haller via lists.openembedded.org wrote: > From: Julian Haller <julian.haller@philips.com> > > When invoking the original git fetcher after downloading a mirror > tarball, BB_FETCH_PREMIRRORONLY is ignored. This leads to git fetch > commands targeting the upstream source being executed silently. Ensure > setting BB_NO_NETWORK before invoking the original fetcher. While this > was only observed for git, setting this in general for all fetcher > types makes sense at this location. > --- > bitbake/lib/bb/fetch2/__init__.py | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py > index fed296097f..76f1440026 100644 > --- a/bitbake/lib/bb/fetch2/__init__.py > +++ b/bitbake/lib/bb/fetch2/__init__.py > @@ -1092,6 +1092,9 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): > # If that tarball is a local file:// we need to provide a symlink to it > dldir = ld.getVar("DL_DIR") > > + if bb.utils.to_boolean(ld.getVar("BB_FETCH_PREMIRRORONLY")): > + ld.setVar("BB_NO_NETWORK", "1") > + > if origud.mirrortarballs and os.path.basename(ud.localpath) in origud.mirrortarballs and os.path.basename(ud.localpath) != os.path.basename(origud.localpath): > # Create donestamp in old format to avoid triggering a re-download > if ud.donestamp: This is nearly right but not quite. You need to ensure BB_NO_NETWORK doesn't leak back into the parent datastore. If you had multiple urls in SRC_URI, you'd see the network was potentially completely disabled after the first url. You'll see that in the try_mirrors() function which calls try_mirror_url, there is a: ld = d.createCopy() which is effectively how we can isolate datastores. You code probably needs to look like: if bb.utils.to_boolean(ld.getVar("BB_FETCH_PREMIRRORONLY")): ld = ld.createCopy() ld.setVar("BB_NO_NETWORK", "1") Cheers, Richard
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index fed296097f..76f1440026 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -1092,6 +1092,9 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): # If that tarball is a local file:// we need to provide a symlink to it dldir = ld.getVar("DL_DIR") + if bb.utils.to_boolean(ld.getVar("BB_FETCH_PREMIRRORONLY")): + ld.setVar("BB_NO_NETWORK", "1") + if origud.mirrortarballs and os.path.basename(ud.localpath) in origud.mirrortarballs and os.path.basename(ud.localpath) != os.path.basename(origud.localpath): # Create donestamp in old format to avoid triggering a re-download if ud.donestamp:
From: Julian Haller <julian.haller@philips.com> When invoking the original git fetcher after downloading a mirror tarball, BB_FETCH_PREMIRRORONLY is ignored. This leads to git fetch commands targeting the upstream source being executed silently. Ensure setting BB_NO_NETWORK before invoking the original fetcher. While this was only observed for git, setting this in general for all fetcher types makes sense at this location. --- bitbake/lib/bb/fetch2/__init__.py | 3 +++ 1 file changed, 3 insertions(+)