domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq806x: upgrade: fix RAMFS_COPY_*

Browse Source 
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: 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:03:39 +02:00
parent 73f675415c
commit 08a94ecaee
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
View File

@@ -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

17
target/linux/ipq806x/base-files/lib/upgrade/platform.sh
View File

@@ -3,11 +3,14 @@
PART_NAME=firmware PART_NAME=firmware
REQUIRE_IMAGE_METADATA=1 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() { platform_check_image() {
return 0; return 0;
} }
platform_pre_upgrade() { platform_do_upgrade() {
local board=$(ipq806x_board_name) local board=$(ipq806x_board_name)
case "$board" in case "$board" in
@@ -18,18 +21,8 @@ platform_pre_upgrade() {
r7500 |\ r7500 |\
r7500v2 |\ r7500v2 |\
r7800) r7800)
nand_do_upgrade "$1" nand_do_upgrade "$ARGV"
;; ;;
ea8500)
linksys_preupgrade "$1"
;;
esac
}
platform_do_upgrade() {
local board=$(ipq806x_board_name)
case "$board" in
c2600) c2600)
PART_NAME="os-image:rootfs" PART_NAME="os-image:rootfs"
MTD_CONFIG_ARGS="-s 0x200000" MTD_CONFIG_ARGS="-s 0x200000"