From 86eee571e269e360bafd36128e80117a93838bc7 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Wed, 1 Dec 2021 21:30:50 +0000 Subject: [PATCH 1/4] rpi-eeprom-digest: Don't require xxd/openssl unless RSA signing is requested. --- rpi-eeprom-digest | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/rpi-eeprom-digest b/rpi-eeprom-digest index 58b4843..fb638f0 100755 --- a/rpi-eeprom-digest +++ b/rpi-eeprom-digest @@ -7,7 +7,7 @@ set -e -OPENSSL=${OPENSSl:-openssl} +OPENSSL=${OPENSSL:-openssl} die() { echo "$@" >&2 @@ -26,12 +26,14 @@ checkDependencies() { die "sha256sum not found. Try installing the coreutilities package." fi - if ! command -v openssl > /dev/null; then - die "openssl not found. Try installing the openssl package." - fi + if [ -n "${KEY}" ]; then + if ! command -v ${OPENSSL} > /dev/null; then + die "${OPENSSL} not found. Try installing the openssl package." + fi - if ! command -v xxd > /dev/null; then - die "xxd not found. Try installing the xxd package." + if ! command -v xxd > /dev/null; then + die "xxd not found. Try installing the xxd package." + fi fi } From 8de4a4db05758b2f64ced5daf28571b1a95018ee Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Thu, 9 Dec 2021 11:10:51 +0000 Subject: [PATCH 2/4] Update default recovery.bin to the latest stable release * Promote the recovery.bin from stable to default. This avoids an issue where recovery.bin fails to load on large FAT32 boot partions with 32K clusters. --- firmware/critical/recovery.bin | Bin 106432 -> 89304 bytes firmware/release-notes.md | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/firmware/critical/recovery.bin b/firmware/critical/recovery.bin index ffa83bb9b03dea365683e134d49500a0b8a0c4b3..755e4062fbd9c5c88c2bfd319229b623df466ea6 100644 GIT binary patch delta 52932 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