From c0f8beb49ac7fc4ccc56692fae2d9932006f961e Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Tue, 19 Aug 2025 08:59:09 -0500
Subject: [PATCH] board/rpi3: post-image: Create grubenv BEFORE image

We obviously have to create the `grubenv` file before running
`genimage`, or it will not be included in the image.
---
 board/raspberrypi3/post-image.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/raspberrypi3/post-image.sh b/board/raspberrypi3/post-image.sh
index a004cf3..ee47d98 100755
--- a/board/raspberrypi3/post-image.sh
+++ b/board/raspberrypi3/post-image.sh
@@ -14,6 +14,9 @@ cp -alf "${BINARIES_DIR}"/rpi-firmware/* "${BINARIES_DIR}"/efi-part/
 
 mkdir -p  "${genimage_tmp}"/rootfs "${genimage_tmp}"/tmp
 
+grub-editenv "${GRUBENV}" set default=0
+grub-editenv "${GRUBENV}" set timeout=3
+
 cd "${BINARIES_DIR}"
 genimage \
 	--rootpath "${genimage_tmp}/rootfs" \
@@ -21,6 +24,3 @@ genimage \
 	--inputpath "${BINARIES_DIR}" \
 	--outputpath "${BINARIES_DIR}" \
 	--config "${BOARD_DIR}"/genimage.cfg
-
-grub-editenv "${GRUBENV}" set default=0
-grub-editenv "${GRUBENV}" set timeout=3