diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-07-14 15:00:36 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-07-14 15:00:36 +0000 |
| commit | b9f12a62890061a8580789be3e579602186491d2 (patch) | |
| tree | 3f362ffb43ce7a5371fd5b28328e2c7aac142b4a | |
| parent | 44e7bc82d5abf0af9b13d02283a3505fe26ba8f0 (diff) | |
| download | upstream-b9f12a62890061a8580789be3e579602186491d2.tar.gz upstream-b9f12a62890061a8580789be3e579602186491d2.tar.bz2 upstream-b9f12a62890061a8580789be3e579602186491d2.zip | |
[mvebu]: handle sysupgrade tar files on the WRT1900AC
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41647 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/mvebu/base-files/lib/upgrade/linksys.sh | 37 | ||||
| -rwxr-xr-x | target/linux/mvebu/base-files/lib/upgrade/platform.sh | 2 |
2 files changed, 34 insertions, 5 deletions
diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh index 8f5a89aaf6..f37831ba75 100644 --- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh @@ -22,6 +22,10 @@ linksys_get_target_firmware() { echo "$target_firmware" } +linksys_get_root_magic() { + (get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null +} + platform_do_upgrade_linksys() { local magic_long="$(get_magic_long "$1")" @@ -35,10 +39,35 @@ platform_do_upgrade_linksys() { exit 1 fi - # we don't know, what filesystem does the other partition use, - # nuke it tobe safe - mtd erase $part_label - get_image "$1" | mtd -n write - $part_label + local target_mtd=$(find_mtd_part $part_label) + + [ "$magic_long" = "73797375" ] && { + CI_KERNPART="$part_label" + if [ "$part_label" = "kernel1" ] + then + CI_UBIPART="rootfs1" + else + CI_UBIPART="rootfs2" + fi + + nand_upgrade_tar "$1" + } + [ "$magic_long" = "27051956" ] && { + # check firmwares' rootfs types + local target_mtd=$(find_mtd_part $part_label) + local oldroot="$(linksys_get_root_magic $target_mtd)" + local newroot="$(linksys_get_root_magic "$1")" + + if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ] + # we're upgrading from a firmware with UBI to one with UBI + then + # erase everything to be safe + mtd erase $part_label + get_image "$1" | mtd -n write - $part_label + else + get_image "$1" | mtd write - $part_label + fi + } } linksys_preupgrade() { diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh index 532f598e4f..f5e44c357a 100755 --- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh +++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh @@ -14,7 +14,7 @@ platform_check_image() { case "$board" in armada-xp-mamba ) - [ "$magic_long" != "27051956" ] && { + [ "$magic_long" != "27051956" -a "$magic_long" != "73797375" ] && { echo "Invalid image type." return 1 } |