From 97d7d4b49defd08e9f22cac3b8a673f14488ed73 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Mon, 11 Jul 2022 09:28:54 +0200
Subject: [PATCH] grub2: update to newer grub2 2.06 version

In UEFI case the lower RAM will not be used for internal allocation, which
should prevent overrides in the former legacy BDA (first page).

Issue #4426
---
 repos/base/ports/grub2.hash | 2 +-
 repos/base/ports/grub2.port | 2 +-
 tool/run/iso.inc            | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/repos/base/ports/grub2.hash b/repos/base/ports/grub2.hash
index 7bab68e1ba..9bb012cc65 100644
--- a/repos/base/ports/grub2.hash
+++ b/repos/base/ports/grub2.hash
@@ -1 +1 @@
-856f9946a1482cbebc519818e3e4736bcd11e5e4
+f15e84afbb47b892ed26a5ae56f5bb038777a3c0
diff --git a/repos/base/ports/grub2.port b/repos/base/ports/grub2.port
index e194a3483a..8daa867699 100644
--- a/repos/base/ports/grub2.port
+++ b/repos/base/ports/grub2.port
@@ -3,7 +3,7 @@ VERSION   := git
 DOWNLOADS := g2fg.git
 
 URL(g2fg) := https://github.com/alex-ab/g2fg.git
-REV(g2fg) := a0c3164b6b23afb25119f2be8c3b7490c1dcb9e2
+REV(g2fg) := 7da0601946bd2bb75f4e9c3b56cb18e44b2997a1
 DIR(g2fg) := boot
 
 default: $(DOWNLOADS)
diff --git a/tool/run/iso.inc b/tool/run/iso.inc
index af2f771964..9170c84f67 100644
--- a/tool/run/iso.inc
+++ b/tool/run/iso.inc
@@ -13,9 +13,6 @@ proc install_iso_bootloader_to_run_dir { } {
 
 	exec mkdir -p [run_dir]/boot/grub/i386-pc
 	exec cp $grub2_path/boot/grub2/eltorito.img [run_dir]/boot/grub/i386-pc/.
-	foreach file [glob -nocomplain $grub2_path/boot/grub2/\*.mod] {
-		exec cp $file [run_dir]/boot/grub/i386-pc/[file tail $file]
-	}
 
 	exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender
 }