Merge pull request #276 from XECDesign/debian/buster

Debian/buster
This commit is contained in:
timg236
2021-01-12 17:05:28 +00:00
committed by GitHub
2 changed files with 10 additions and 3 deletions

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
rpi-eeprom (11.3-1) buster; urgency=medium
[ Tim Gover ]
* rpi-eeprom-update: Add trailing / so find follows the FW symlink
-- Serge Schneider <serge@raspberrypi.com> Tue, 12 Jan 2021 16:53:15 +0000
rpi-eeprom (11.2-1) buster; urgency=medium
[ andrum99 ]

View File

@@ -296,7 +296,7 @@ BOOTLOADER_UPDATE_VERSION=0
getBootloaderUpdateVersion() {
BOOTLOADER_UPDATE_VERSION=0
match=".*/pieeprom-[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9].bin"
latest="$(find "${FIRMWARE_IMAGE_DIR}" -maxdepth 1 -type f -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)"
latest="$(find "${FIRMWARE_IMAGE_DIR}/" -maxdepth 1 -type f -size "${EEPROM_SIZE}c" -regex "${match}" | sort -r | head -n1)"
if [ -f "${latest}" ]; then
BOOTLOADER_UPDATE_VERSION=$(strings "${latest}" | grep BUILD_TIMESTAMP | sed 's/.*=//g')
BOOTLOADER_UPDATE_IMAGE="${latest}"
@@ -345,13 +345,13 @@ checkDependencies() {
fi
fi
if [ ! -d "${FIRMWARE_IMAGE_DIR}" ]; then
if [ ! -e "${FIRMWARE_IMAGE_DIR}" ]; then
die "EEPROM updates directory ${FIRMWARE_IMAGE_DIR} not found."
fi
# If a board revision specific firmware directory is defined then use that
# in preference to the generic directory.
if [ -d "${FIRMWARE_IMAGE_DIR}-${BOARD_INFO}" ]; then
if [ -e "${FIRMWARE_IMAGE_DIR}-${BOARD_INFO}" ]; then
FIRMWARE_IMAGE_DIR="${FIRMWARE_IMAGE_DIR}-${BOARD_INFO}"
fi