From 41770add03ad77a0ce41ed424ad050238f7d9272 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Fri, 9 Nov 2018 12:27:12 +0100 Subject: [PATCH] base-files: fwtool: Fix wrong checksum on combined-image with metadata MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If I create following image: define Device/engenius-m36 IMAGE/sysupgrade.bin := combined-image | append-metadata endef Sysupgrade then errors out: Invalid image. Contents do not match checksum (image:cd285595eaf297370404ae0e2815ec1a calculated:2cf9a2286fb6b01af3ea189128017d44) Image check 'platform_check_image' failed. By removing the metadata from the image I get combined-image checksum working again and sysupgrade works. Signed-off-by: Petr Å tetiar --- package/base-files/files/lib/upgrade/fwtool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh index 3f28fccd90..e0e5c96c89 100644 --- a/package/base-files/files/lib/upgrade/fwtool.sh +++ b/package/base-files/files/lib/upgrade/fwtool.sh @@ -28,7 +28,7 @@ fwtool_check_image() { . /usr/share/libubox/jshn.sh - if ! fwtool -q -i /tmp/sysupgrade.meta "$1"; then + if ! fwtool -q -t -i /tmp/sysupgrade.meta "$1"; then echo "Image metadata not found" [ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && { echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware" -- 2.25.1