On Fri, Nov 21, 2025 at 02:22:15PM +0100, Quentin Schulz wrote: > From: Quentin Schulz <[email protected]> > > grub bootstrap script downloads gnulib from a non-mirror URL and thus is > unreliable. > > Instead, manually clone the gnulib repo from a mirror URL and pass that > repo to the bootstrap script via --gnulib-srcdir. > > Signed-off-by: Quentin Schulz <[email protected]> > --- > tools/docker/Dockerfile | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile > index 34713c5e8b2..85274c303c8 100644 > --- a/tools/docker/Dockerfile > +++ b/tools/docker/Dockerfile > @@ -148,12 +148,13 @@ RUN > --mount=type=cache,target=/var/cache/apt,sharing=locked \ > zip > > # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit > -RUN git clone https://https.git.savannah.gnu.org/git/grub.git /tmp/grub && \ > +RUN git clone https://https.git.savannah.gnu.org/git/gnulib.git /tmp/gnulib > && \ > + git clone https://https.git.savannah.gnu.org/git/grub.git /tmp/grub && \
Right now, the next branch is in a funny spot. Post -rc2 I applied to master some changes to make CI more reliable which also meant that right here we do git clone --depth=1 -b TAG. And doing --depth=1 -b TAG is something we should be doing here for gnulib as well. Since -rc3 is this coming Monday and merge to next shortly after, can you do that and rebase on top then please? Thanks! -- Tom
signature.asc
Description: PGP signature
