0022-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch 1.0 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Sat, 22 Apr 2017 21:27:04 +0200
  3. Subject: ramips: sysupgrade: move nand_do_upgrade call to platform_do_upgrade
  4. All targets with NAND support should gradually move their nand_do_upgrade
  5. calls from platform_pre_upgrade to platform_do_upgrade.
  6. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  7. diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
  8. index 7f5b1dd070b1bfe0b86b093a55165b5a139eb37c..a5cca2080d3b96cef92286b1b15f4f8832d9f8c5 100755
  9. --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
  10. +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
  11. @@ -254,20 +254,13 @@ platform_nand_pre_upgrade() {
  12. esac
  13. }
  14. -platform_pre_upgrade() {
  15. +platform_do_upgrade() {
  16. local board=$(ramips_board_name)
  17. case "$board" in
  18. ubnt-erx)
  19. nand_do_upgrade "$ARGV"
  20. ;;
  21. - esac
  22. -}
  23. -
  24. -platform_do_upgrade() {
  25. - local board=$(ramips_board_name)
  26. -
  27. - case "$board" in
  28. *)
  29. default_do_upgrade "$ARGV"
  30. ;;