ar71xx: sysupgrade: accept ath79 combined-image
authorTomasz Maciej Nowak <tomek_n@o2.pl>
Fri, 23 Aug 2019 13:50:48 +0000 (15:50 +0200)
committerChristian Lamparter <chunkeey@gmail.com>
Sat, 31 Aug 2019 22:12:02 +0000 (00:12 +0200)
There is md5 sum of whole image embedded in combined-image header which
is checked on sysupgrade. The check will fail for ath79 images which
may have embedded metadata. This is because metadata are appended after
the combined image is created. To allow smooth transition from ar71xx to
ath79, strip metadata before calculating md5 sum for whole image.

Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
target/linux/ar71xx/base-files/lib/upgrade/platform.sh

index 6898c0e0c21a825d48eb9a997856caaa9e6233d1..3853140702fe48ba096ee112885b1db48fdff63a 100755 (executable)
@@ -394,7 +394,7 @@ platform_check_image() {
                }
 
                local md5_img=$(dd if="$1" bs=2 skip=9 count=16 2>/dev/null)
-               local md5_chk=$(dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"
+               local md5_chk=$(fwtool -q -t -i /dev/null "$1"; dd if="$1" bs=$CI_BLKSZ skip=1 2>/dev/null | md5sum -); md5_chk="${md5_chk%% *}"
 
                if [ -n "$md5_img" -a -n "$md5_chk" ] && [ "$md5_img" = "$md5_chk" ]; then
                        return 0