[11/18] CI: Dockerfile: Bump GRUB to 2.12

Message ID	20240717-docker-image-v1-11-7c7fc6251e7a@flygoat.com
State	Changes Requested
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> Feedback-ID: ifd894703:Fastmail From: Jiaxun Yang <jiaxun.yang@flygoat.com> Date: Wed, 17 Jul 2024 22:29:22 +0800 Subject: [PATCH 11/18] CI: Dockerfile: Bump GRUB to 2.12 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240717-docker-image-v1-11-7c7fc6251e7a@flygoat.com> References: <20240717-docker-image-v1-0-7c7fc6251e7a@flygoat.com> In-Reply-To: <20240717-docker-image-v1-0-7c7fc6251e7a@flygoat.com> To: u-boot@lists.denx.de Cc: Simon Glass <sjg@chromium.org>, Alper Nebi Yasak <alpernebiyasak@gmail.com>, Tom Rini <trini@konsulko.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Ilias Apalodimas <ilias.apalodimas@linaro.org>, Jiaxun Yang <jiaxun.yang@flygoat.com> Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	New CI image and fixes \| expand [00/18] New CI image and fixes [01/18] binman: Replace pkg_resources with importlib.resources [02/18] py: Replace distutils.core with setuptools [03/18] doc/sphinx: Remove usage of six [04/18] py: Bump pylint version and clear warnings [05/18] binman: Workaround lz4 cli padding in test cases [06/18] tests/test_event_dump: Relax match rule for output [07/18] lib/charset & efi: Fix possible unaligned accesses [08/18] CI: Ensure pip install is always performed in venv [09/18] CI: Dockerfile: Set global git name & email config [10/18] CI: Dockerfile: Bump base OS version [11/18] CI: Dockerfile: Bump GRUB to 2.12 [12/18] CI: Dockerfile: Bump QEMU to 9.0.1 [13/18] CI: Dockerfile: Bump fiptool to 2.10.4 [14/18] CI: Dockerfile: Bump genimage to 17 [15/18] CI: Dockerfile: Use kernel.org upstream for trace-cmd [16/18] CI: Dockerfile: Bump coreboot to 24.05 [17/18] CI: Dockerfile: Add LoongArch64 support [NFC,18/18] Use Jiaxun's CI Image

Message ID

20240717-docker-image-v1-11-7c7fc6251e7a@flygoat.com

State

Changes Requested

Delegated to:

Tom Rini

Headers

Feedback-ID: ifd894703:Fastmail
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
Date: Wed, 17 Jul 2024 22:29:22 +0800
Subject: [PATCH 11/18] CI: Dockerfile: Bump GRUB to 2.12
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240717-docker-image-v1-11-7c7fc6251e7a@flygoat.com>
References: <20240717-docker-image-v1-0-7c7fc6251e7a@flygoat.com>
In-Reply-To: <20240717-docker-image-v1-0-7c7fc6251e7a@flygoat.com>
To: u-boot@lists.denx.de
Cc: Simon Glass <sjg@chromium.org>,
 Alper Nebi Yasak <alpernebiyasak@gmail.com>, Tom Rini <trini@konsulko.com>,
 Heinrich Schuchardt <xypron.glpk@gmx.de>,
 Ilias Apalodimas <ilias.apalodimas@linaro.org>,
 Jiaxun Yang <jiaxun.yang@flygoat.com>
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

New CI image and fixes | expand

Commit Message

Jiaxun Yang July 17, 2024, 2:29 p.m. UTC

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
 tools/docker/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 0bf2d180e255..8e144a2b64e9 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -136,9 +136,7 @@  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 cherry-pick 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 && \
-	git cherry-pick 403d6540cd608b2706cfa0cb4713f7e4b490ff45 && \
+	git checkout grub-2.12 && \
 	./bootstrap && \
 	mkdir -p /opt/grub && \
 	./configure --target=aarch64 --with-platform=efi \

[11/18] CI: Dockerfile: Bump GRUB to 2.12

Commit Message

Patch