From 3dac34de2563be633d58c768c685ec70bc410c3f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 6 Sep 2019 12:44:49 +0200 Subject: [PATCH] bcm53xx: extend firmware validation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This provides TRX validation result to the validation JSON. It also prevents users from installing broken firmware files. Signed-off-by: Rafał Miłecki (cherry picked from commit c19b9f9a2623c110222210d04f75ace0e594c7e9) --- .../linux/bcm53xx/base-files/lib/upgrade/platform.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh index 1d829c6519..a337889833 100644 --- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh @@ -88,7 +88,10 @@ platform_check_image() { if ! otrx check "$1" -o "$header_len"; then echo "No valid TRX firmware in the CHK image" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; "cybertan") @@ -103,7 +106,10 @@ platform_check_image() { if ! otrx check "$1" -o 32; then echo "No valid TRX firmware in the CyberTAN image" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; "safeloader") @@ -133,11 +139,15 @@ platform_check_image() { if ! otrx check "$1"; then echo "Invalid (corrupted?) TRX firmware" + notify_firmware_test_result "trx_valid" 0 error=1 + else + notify_firmware_test_result "trx_valid" 1 fi ;; *) - echo "Invalid image type. Please use only .trx files" + echo "Invalid image type. Please use firmware specific for this device." + notify_firmware_broken error=1 ;; esac -- 2.30.2