From bbc8e9e388524cbcca7498363bfde86b93206b74 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.com>
Date: Wed, 3 Jan 2024 18:22:12 +0000
Subject: [PATCH] Skip bootloader updates if rpi-eeprom package is too old

Skip the bootloader updates without stopping rpi-update of the firmware

See: https://github.com/raspberrypi/rpi-update/issues/28
---
 rpi-update | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/rpi-update b/rpi-update
index 0529299..dfc6b10 100755
--- a/rpi-update
+++ b/rpi-update
@@ -773,6 +773,15 @@ if [[ "${FW_REV}" == "" ]]; then
 	exit 1
 fi
 
+if [ ! -d "/lib/firmware/raspberrypi/bootloader-2711/latest" ]; then
+	if [[ "${SKIP_BOOTLOADER}" != 1 ]]; then
+		# The chip specific firmware directory structure is required for rpi-eeprom updates
+		# RPi OS Bookworm or newer required.
+		SKIP_BOOTLOADER=1
+		echo "rpi-eeprom firmware package appears to be too old. Skipping bootloader updates"
+	fi
+fi
+
 if [[ ! -f "${FW_REVFILE}" ]]; then
 	LOCAL_HASH=0
 	echo " *** We're running for the first time"