0d07d179d8
This reverts commit 582635b031.
The segfault issue has disappeared, so the workaround is not needed
anymore.
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Mon, 10 Jul 2017 18:03:39 +0200
|
|
Subject: 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
|
|
--- 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
|
|
}
|
|
}
|
|
-
|
|
-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 c3741f9ff242cddb3c185c2f638c7b4dff781e1b..6455b57cfb1346b7cc9e103065080d8ae92edc19 100644
|
|
--- 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
|
|
|
|
+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_pre_upgrade() {
|
|
+platform_do_upgrade() {
|
|
local board=$(ipq806x_board_name)
|
|
|
|
case "$board" in
|
|
@@ -17,18 +20,8 @@ platform_pre_upgrade() {
|
|
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"
|