From 80f864f5c212ac2a6f99db6b7ea5e4a12661d04e Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Thu, 17 Sep 2026 14:57:37 +0200
Subject: [PATCH 1/2] Bump buildroot to fix EDK2 builds when hostcc >=GCC15

This is the case starting with Ubuntu 26.04, for example.
---
 buildroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildroot b/buildroot
index 1345b40b2..04ebd60f8 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 1345b40b2ce56be344c876db3b7a27c6b29eab3c
+Subproject commit 04ebd60f8d68497970b72db06f31b7d18037cead

From b10e8e515b67a0a32c2b649c6ca82ac6b727200a Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Thu, 17 Sep 2026 14:58:57 +0200
Subject: [PATCH 2/2] image-itb-qcow: Fix image generation when building on
 Ubuntu 26.04

> - What do you mean by "fragile"?!

...asks the author. Well, for example, a distribution may swap out the
whole coreutils package to the new shiny one rewritten in Rust,
complete with brand new error messages, which would break this. For
example.

See this -> L <-? That's mine! I'm holding it.
---
 board/common/image/image-itb-qcow/generate.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/board/common/image/image-itb-qcow/generate.sh b/board/common/image/image-itb-qcow/generate.sh
index 3969d5547..c85a8f514 100755
--- a/board/common/image/image-itb-qcow/generate.sh
+++ b/board/common/image/image-itb-qcow/generate.sh
@@ -7,11 +7,15 @@ G=30
 
 size2int()
 {
-    # Use truncate's error message to convert input like "1K to "1024"
-    # for us.
-    #
-    # - What do you mean by "fragile"?!
-    truncate -s $1 /dev/null 2>&1 | awk '{ print($7); }'
+    local _num=$(echo $1 | sed -e 's/[KkMmGg]//')
+
+    case $1 in
+	*[Kk]) _num=$((_num << K)) ;;
+	*[Mm]) _num=$((_num << M)) ;;
+	*[Gg]) _num=$((_num << G)) ;;
+    esac
+
+    echo $_num
 }
 
 dimension()