123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 |
- From: Matthias Schiffer <mschiffer@universe-factory.net>
- Date: Mon, 10 Jul 2017 18:16:23 +0200
- Subject: kirkwood: upgrade: fix RAMFS_COPY_*
- RAMFS_COPY_* are moved to platform.sh toplevel. 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/kirkwood/base-files/lib/upgrade/linksys.sh b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
- index 13a8f1cb554462acf39a59c9d5c1e6cd4ec222f5..dde3bd1b2190d68ce54e6c2883a45032d58599b2 100644
- --- a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
- +++ b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
- @@ -69,11 +69,3 @@ platform_do_upgrade_linksys() {
- 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/kirkwood/base-files/lib/upgrade/platform.sh b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
- index e7c6a1120a90147380f4fcf644eb7078c1bc1659..c8c66c1b9d67759305ee836f9d84b9a2968a9493 100644
- --- a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
- +++ b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
- @@ -1,5 +1,8 @@
- . /lib/kirkwood.sh
-
- +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() {
- [ "$#" -gt 1 ] && return 1
- local board="$(kirkwood_board_name)"
- @@ -33,19 +36,7 @@ platform_do_upgrade() {
- platform_do_upgrade_linksys "$ARGV"
- ;;
- *)
- - default_do_upgrade "$@"
- - ;;
- - esac
- -}
- -
- -platform_pre_upgrade() {
- - local board=$(kirkwood_board_name)
- -
- - case "$board" in
- - "linksys-audi"|\
- - "linksys-viper") ;;
- - *)
- - nand_do_upgrade $1
- + nand_do_upgrade "$ARGV"
- ;;
- esac
- }
|