base-files: drop support for NAND upgrade in platform_pre_upgrade()
authorRafał Miłecki <rafal@milecki.pl>
Tue, 2 Jul 2019 14:10:57 +0000 (16:10 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Mon, 8 Jul 2019 05:38:51 +0000 (07:38 +0200)
With bcm53xx switched to the new procedure there is no more need for
keeping that backward compatibility code.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
package/base-files/Makefile
package/base-files/files/lib/upgrade/common.sh
package/base-files/files/lib/upgrade/nand.sh
package/base-files/files/lib/upgrade/stage2

index 551ef71..44aef87 100644 (file)
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=202
+PKG_RELEASE:=203
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
index 0f6fab9..a13a6aa 100644 (file)
@@ -228,9 +228,7 @@ default_do_upgrade() {
 
 do_upgrade_stage2() {
        v "Performing system upgrade..."
-       if [ -n "$do_upgrade" ]; then
-               eval "$do_upgrade"
-       elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
+       if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
                platform_do_upgrade "$IMAGE"
        else
                default_do_upgrade "$IMAGE"
index 99916a4..9f258a8 100644 (file)
@@ -280,15 +280,6 @@ nand_upgrade_tar() {
 
 # Recognize type of passed file and start the upgrade process
 nand_do_upgrade() {
-       if [ -n "$IS_PRE_UPGRADE" ]; then
-               # Previously, nand_do_upgrade was called from the platform_pre_upgrade
-               # hook; this piece of code handles scripts that haven't been
-               # updated. All scripts should gradually move to call nand_do_upgrade
-               # from platform_do_upgrade instead.
-               export do_upgrade="nand_do_upgrade '$1'"
-               return
-       fi
-
        local file_type=$(identify $1)
 
        if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then
index bdc12c7..05d9214 100755 (executable)
@@ -136,10 +136,7 @@ sleep 1
 
 
 if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
-       IS_PRE_UPGRADE=1 platform_pre_upgrade "$IMAGE"
-
-       # Needs to be unset again because of busybox weirdness ...
-       IS_PRE_UPGRADE=
+       platform_pre_upgrade "$IMAGE"
 fi
 
 if [ -n "$(rootfs_type)" ]; then