Skip to content

Commit f464da6

Browse files
committed
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: 30f61a3 "base-files: always use staged sysupgrade" Signed-off-by: Matthias Schiffer <[email protected]>
1 parent 08a94ec commit f464da6

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,3 @@ platform_do_upgrade_linksys() {
6969
fi
7070
}
7171
}
72-
73-
linksys_preupgrade() {
74-
export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
75-
export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
76-
export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
77-
}
78-
79-
append sysupgrade_pre_upgrade linksys_preupgrade

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
. /lib/kirkwood.sh
22

3+
RAMFS_COPY_BIN='/usr/sbin/fw_printenv /usr/sbin/fw_setenv'
4+
RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock'
5+
36
platform_check_image() {
47
[ "$#" -gt 1 ] && return 1
58
local board="$(kirkwood_board_name)"
@@ -33,19 +36,7 @@ platform_do_upgrade() {
3336
platform_do_upgrade_linksys "$ARGV"
3437
;;
3538
*)
36-
default_do_upgrade "$@"
37-
;;
38-
esac
39-
}
40-
41-
platform_pre_upgrade() {
42-
local board=$(kirkwood_board_name)
43-
44-
case "$board" in
45-
"linksys-audi"|\
46-
"linksys-viper") ;;
47-
*)
48-
nand_do_upgrade $1
39+
nand_do_upgrade "$ARGV"
4940
;;
5041
esac
5142
}

0 commit comments

Comments
 (0)