From 0944712c0aa5e594fc9210cea7e2b0cfe69477b0 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.com>
Date: Sat, 18 Jan 2025 20:12:03 +0000
Subject: [PATCH] scripts: Failover to /usr/lib before /lib if FIRMWARE_ROOT is
 not set

Update the scripts to follow "merged-/usr" conventions by default
https://wiki.debian.org/UsrMerge
---
 rpi-eeprom-update         | 2 ++
 rpi-eeprom-update-default | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rpi-eeprom-update b/rpi-eeprom-update
index d6dab0b..b970142 100755
--- a/rpi-eeprom-update
+++ b/rpi-eeprom-update
@@ -14,6 +14,8 @@ LOCAL_MODE=0
 if [ -n "$FIRMWARE_ROOT" ]; then
    # Provided by environment
    true
+elif [ -d /usr/lib/firmware/raspberrypi/bootloader ] || [ -d /usr/lib/firmware/raspberrypi/bootloader-2711 ] || [ -d /usr/lib/firmware/raspberrypi/bootloader-2712 ]; then
+   FIRMWARE_ROOT=/usr/lib/firmware/raspberrypi/bootloader
 elif [ -d /lib/firmware/raspberrypi/bootloader ] || [ -d /lib/firmware/raspberrypi/bootloader-2711 ] || [ -d /lib/firmware/raspberrypi/bootloader-2712 ]; then
    FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
 else
diff --git a/rpi-eeprom-update-default b/rpi-eeprom-update-default
index a31d288..1727048 100644
--- a/rpi-eeprom-update-default
+++ b/rpi-eeprom-update-default
@@ -1,5 +1,5 @@
 
-FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
+FIRMWARE_ROOT=/usr/lib/firmware/raspberrypi/bootloader
 FIRMWARE_RELEASE_STATUS="default"
 FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
 EEPROM_CONFIG_HOOK=