rpi-eeprom-update: Restrict package checksums to EEPROM images.

Only check EEPROM image binaries because it's annoying if
rpi-eeprom-update errors due to the release notes or the script
changing.
This commit is contained in:
Tim Gover
2020-09-24 14:56:32 +01:00
parent 8d4af8db97
commit 29fe479af9

View File

@@ -71,8 +71,12 @@ VL805_UPDATE_VERSION=
# The update actions selected by the version check # The update actions selected by the version check
ACTION_UPDATE_BOOTLOADER=0 ACTION_UPDATE_BOOTLOADER=0
ACTION_UPDATE_VL805=0 ACTION_UPDATE_VL805=0
CHECKSUMS=''
cleanup() { cleanup() {
if [ -f "${CHECKSUMS}" ]; then
rm -f "${CHECKSUMS}"
fi
if [ -f "${TMP_EEPROM_IMAGE}" ]; then if [ -f "${TMP_EEPROM_IMAGE}" ]; then
rm -f "${TMP_EEPROM_IMAGE}" rm -f "${TMP_EEPROM_IMAGE}"
fi fi
@@ -183,15 +187,17 @@ applyRecoveryUpdate()
} }
applyUpdate() { applyUpdate() {
checksums_file="/var/lib/dpkg/info/rpi-eeprom.md5sums" package_checksums_file="/var/lib/dpkg/info/rpi-eeprom.md5sums"
CHECKSUMS=$(mktemp)
cat "${package_checksums_file}" | grep -E '\.bin$' > "${CHECKSUMS}"
[ "$(id -u)" = "0" ] || die "* Must be run as root - try 'sudo rpi-eeprom-update'" [ "$(id -u)" = "0" ] || die "* Must be run as root - try 'sudo rpi-eeprom-update'"
if [ "${IGNORE_DPKG_CHECKSUMS}" = 0 ] && [ -f "${checksums_file}" ]; then if [ "${IGNORE_DPKG_CHECKSUMS}" = 0 ] && [ -f "${CHECKSUMS}" ]; then
( (
cd / cd /
if ! md5sum -c "${checksums_file}" > /dev/null 2>&1; then if ! md5sum -c "${CHECKSUMS}" > /dev/null 2>&1; then
md5sum -c "${checksums_file}" md5sum -c "${CHECKSUMS}"
die "rpi-eeprom checksums failed - try reinstalling this package" die "rpi-eeprom checksums failed - try reinstalling this package"
fi fi
) )