KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kirkwood: upgrade: fix RAMFS_COPY_*

Browse source 
RAMFS_COPY_* are moved to platform.sh toplevel. The nand_do_upgrade call is
moved to platform_do_upgrade.

Fixes: 30f61a34b4 "base-files: always use staged sysupgrade"
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2017-07-10 18:16:23 +02:00
parent 08a94ecaee
commit f464da623d
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
2 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
View file

@ -69,11 +69,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

17
target/linux/kirkwood/base-files/lib/upgrade/platform.sh
View file

@ -1,5 +1,8 @@
. /lib/kirkwood.sh . /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() { platform_check_image() {
[ "$#" -gt 1 ] && return 1 [ "$#" -gt 1 ] && return 1
local board="$(kirkwood_board_name)" local board="$(kirkwood_board_name)"
@ -33,19 +36,7 @@ platform_do_upgrade() {
platform_do_upgrade_linksys "$ARGV" platform_do_upgrade_linksys "$ARGV"
;; ;;
*) *)
default_do_upgrade "$@" nand_do_upgrade "$ARGV"
;;
esac
}
platform_pre_upgrade() {
local board=$(kirkwood_board_name)
case "$board" in
"linksys-audi"|\
"linksys-viper") ;;
*)
nand_do_upgrade $1
;; ;;
esac esac
} }