diff options
| author | Tomasz Maciej Nowak <tomek_n@o2.pl> | 2019-08-23 15:50:48 +0200 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2019-09-29 11:30:50 +0200 |
| commit | 6cdd518eb14a66dbd9b09c10b6467a48fe5cf470 (patch) | |
| tree | 5bb2f0f09f042284cce184434aa4e1588ea473ad | |
| parent | b5a70a3fcd3eb57e202fd0c9692a704620de6268 (diff) | |
| download | upstream-6cdd518eb14a66dbd9b09c10b6467a48fe5cf470.tar.gz upstream-6cdd518eb14a66dbd9b09c10b6467a48fe5cf470.tar.bz2 upstream-6cdd518eb14a66dbd9b09c10b6467a48fe5cf470.zip | |
ar71xx: sysupgrade: accept ath79 combined-image
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>
(cherry picked from commit 8b4109c2b4d60495d046157d1baca9b1cdbf8dc8)
| -rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index f211ce7156..91bffcb8c1 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -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 |