KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: fwtool: Fix wrong checksum on combined-image with metadata

Browse source 
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 <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2018-11-09 12:27:12 +01:00 committed by John Crispin
parent 975019b3a7
commit 41770add03
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/files/lib/upgrade/fwtool.sh
View file

@ -28,7 +28,7 @@ fwtool_check_image() {
. /usr/share/libubox/jshn.sh . /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" echo "Image metadata not found"
[ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && { [ "$REQUIRE_IMAGE_METADATA" = 1 -a "$FORCE" != 1 ] && {
echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware" echo "Use sysupgrade -F to override this check when downgrading or flashing to vendor firmware"