ipq806x: upgrade: fix RAMFS_COPY_*

RAMFS_COPY_* are moved to platform.sh toplevel. The unneeded
linksys_preupgrade function is removed, and the nand_do_upgrade call is
moved to platform_do_upgrade.

Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
index 12f25efdae87979e79a252237f735932cb66d42f..0234ce0a51a0a92dcd719102f83e19686442574a 100644 (file)
--- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
@@ -99,12 +99,3 @@ platform_do_upgrade_linksys() {
                fi
        }
 }
                fi
        }
 }

-
-linksys_preupgrade() {
-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
-       export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
-
-}
-
-append sysupgrade_pre_upgrade linksys_preupgrade

diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index fd08db3b08486aeb1e2d0bb651c7371db2f2131a..141058f7bae2775397c9fdf8224f8f9d035795fb 100644 (file)
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -3,11 +3,14 @@
 PART_NAME=firmware
 REQUIRE_IMAGE_METADATA=1
 
 PART_NAME=firmware
 REQUIRE_IMAGE_METADATA=1
 

+RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
+RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
+

 platform_check_image() {
        return 0;
 }
 
 platform_check_image() {
        return 0;
 }
 

-platform_pre_upgrade() {
+platform_do_upgrade() {

        local board=$(ipq806x_board_name)
 
        case "$board" in
        local board=$(ipq806x_board_name)
 
        case "$board" in


@@ -18,18 +21,8 @@ platform_pre_upgrade() {
        r7500 |\
        r7500v2 |\
        r7800)
        r7500 |\
        r7500v2 |\
        r7800)

-               nand_do_upgrade "$1"
-               ;;
-       ea8500)
-               linksys_preupgrade "$1"
+               nand_do_upgrade "$ARGV"

                ;;
                ;;

-       esac
-}
-
-platform_do_upgrade() {
-       local board=$(ipq806x_board_name)
-
-       case "$board" in

        c2600)
                PART_NAME="os-image:rootfs"
                MTD_CONFIG_ARGS="-s 0x200000"
        c2600)
                PART_NAME="os-image:rootfs"
                MTD_CONFIG_ARGS="-s 0x200000"