summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-11-27 11:17:23 -0600
committerTom Rini <trini@konsulko.com>2024-12-02 16:34:30 -0600
commit70712a6acb3d916055b84c96768f8e10bfd49589 (patch)
tree27a4a1810da17e6262243f7355e9b43de783ec4c
parent2fc92695fb65ab9ce8a4e35371c1ef9cfdbf642c (diff)
docker: Update to grub-2.12
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. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--tools/docker/Dockerfile5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 449745712de..11beaedf9b3 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 \