From 9cc3aeb6e83dcb8ba3329f73b6c68498f1887575 Mon Sep 17 00:00:00 2001 From: Ruihan Li Date: Tue, 17 Dec 2024 00:18:05 +0800 Subject: [PATCH] Use Asterinas-specific fork of GRUB --- tools/docker/Dockerfile.jinja | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/docker/Dockerfile.jinja b/tools/docker/Dockerfile.jinja index 60a6b800..2508422d 100644 --- a/tools/docker/Dockerfile.jinja +++ b/tools/docker/Dockerfile.jinja @@ -308,10 +308,9 @@ FROM build-grub as grub # in the GRUB release. The Ubuntu release notoriously modifies the GRUB source code and enforce # EFI handover boot, which is deprecated. So we have to build GRUB from source. WORKDIR /root -RUN wget -O grub.tar.xz https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz \ - && mkdir /root/grub \ - && tar xf grub.tar.xz --strip-components=1 -C /root/grub \ - && rm grub.tar.xz +# See also: https://github.com/asterinas/asterinas/pull/1710 +RUN git clone --single-branch -b asterinas/2.12 https://github.com/asterinas/grub.git + && git -C grub checkout 0633bc8 # Fetch and install the Unicode font data for grub. RUN wget -O unifont.pcf.gz https://unifoundry.com/pub/unifont/unifont-15.1.04/font-builds/unifont-15.1.04.pcf.gz \ && mkdir -pv /usr/share/fonts/unifont \