From 71ef83abbcfc6cd43a8f5cb7570f341e55a49e9b Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Thu, 10 Jun 2021 10:04:13 +0100 Subject: [PATCH] Add a test to cause the script to exit cleanly on non-Pi hardware At present, the update script exits cleanly in the case it finds itself run on Pi hardware prior to the 4/CM4/400, but if installed on non-Pi hardware exits with various slightly cryptic errors (missing vcgencmd and some subsequent math errors from trying to bit-shift the empty BOARD_INFO variable). This patch adds a similar exit to the non-Pi 4 case, with a slightly more useful message. --- rpi-eeprom-update | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index bc08d96..c03fbf4 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -315,8 +315,11 @@ checkDependencies() { BOARD_INFO="$(od -v -An -t x1 /sys/firmware/devicetree/base/system/linux,revision | tr -d ' \n')" elif grep -q Revision /proc/cpuinfo; then BOARD_INFO="$(sed -n '/^Revision/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo)" - else + elif command -v vcgencmd > /dev/null; then BOARD_INFO="$(vcgencmd otp_dump | grep '30:' | sed 's/.*://')" + else + echo "No Raspberry Pi board info found" + exit ${EXIT_SUCCESS} fi if [ $(((0x$BOARD_INFO >> 23) & 1)) -eq 0 ] || [ $(((0x$BOARD_INFO >> 12) & 15)) -ne 3 ]; then