raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-20 21:13:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Failover to /usr/lib before /lib if FIRMWARE_ROOT is not set

Browse Source 
Update the scripts to follow "merged-/usr" conventions by default
https://wiki.debian.org/UsrMerge
This commit is contained in:
Tim Gover
2025-01-18 20:12:03 +00:00
parent cc58b7d6ce
commit 0944712c0a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpi-eeprom-update
View File

@@ -14,6 +14,8 @@ LOCAL_MODE=0
if [ -n "$FIRMWARE_ROOT" ]; then if [ -n "$FIRMWARE_ROOT" ]; then
# Provided by environment # Provided by environment
true 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 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 FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
else else

2
rpi-eeprom-update-default
View File

@@ -1,5 +1,5 @@
FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader FIRMWARE_ROOT=/usr/lib/firmware/raspberrypi/bootloader
FIRMWARE_RELEASE_STATUS="default" FIRMWARE_RELEASE_STATUS="default"
FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup" FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
EEPROM_CONFIG_HOOK= EEPROM_CONFIG_HOOK=