| Message ID | 20241127172247.1488685-6-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 70712a6acb3d916055b84c96768f8e10bfd49589 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | CI: Set up for an arm64 runner | expand |
On Wed, 27 Nov 2024 at 10:23, Tom Rini <trini@konsulko.com> wrote: > > The current release of grub is 2.12 and it will be good to pick this up > now so that we can update other parts of our stack. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > Changes in v6: > - New patch > --- > tools/docker/Dockerfile | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 449745712de3..11beaedf9b30 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -55,6 +55,7 @@ RUN apt-get update && apt-get install -y \ flex \ gawk \ gdisk \ + gettext \ git \ gnu-efi \ gnutls-dev \ @@ -128,11 +129,9 @@ RUN chmod +r /boot/vmlinu* # Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ cd /tmp/grub && \ - git checkout grub-2.06 && \ + git checkout grub-2.12 && \ git config --global user.name "GitLab CI Runner" && \ git config --global user.email trini@konsulko.com && \ - git cherry-pick 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 && \ - git cherry-pick 403d6540cd608b2706cfa0cb4713f7e4b490ff45 && \ ./bootstrap && \ mkdir -p /opt/grub && \ ./configure --target=aarch64 --with-platform=efi \
The current release of grub is 2.12 and it will be good to pick this up now so that we can update other parts of our stack. Signed-off-by: Tom Rini <trini@konsulko.com> --- Changes in v6: - New patch --- tools/docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)