0d07d179d8
This reverts commit 582635b031.
The segfault issue has disappeared, so the workaround is not needed
anymore.
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Sat, 10 Jun 2017 16:14:54 +0200
|
|
Subject: bcm53xx: upgrade: fix RAMFS_COPY_*
|
|
|
|
Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
|
|
index 097ad63adfecdd70019acaa5b652d2056e774c3f..8cc8c8b34e9f349f1d1283ac00f9782b52ab01c1 100755
|
|
--- a/package/base-files/files/lib/upgrade/stage2
|
|
+++ b/package/base-files/files/lib/upgrade/stage2
|
|
@@ -48,7 +48,7 @@ switch_to_ramfs() {
|
|
/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
|
|
/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \
|
|
/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
|
|
- /bin/mknod /bin/touch
|
|
+ /bin/mknod /bin/touch /bin/sed
|
|
|
|
install_bin /sbin/mtd
|
|
install_bin /sbin/mount_root
|
|
diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
|
|
index f2e007db22fa8fde93bf0dd58b359f6515e0445c..6a9e4950450cb896db7ebb3eb901b5cf51030295 100644
|
|
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
|
|
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
|
|
@@ -1,3 +1,5 @@
|
|
+RAMFS_COPY_BIN='/usr/bin/osafeloader /usr/bin/oseama'
|
|
+
|
|
PART_NAME=firmware
|
|
|
|
# $(1): file to read magic from
|
|
@@ -260,8 +262,6 @@ platform_pre_upgrade_seama() {
|
|
}
|
|
|
|
platform_pre_upgrade() {
|
|
- export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/bin/osafeloader /usr/bin/oseama /bin/sed"
|
|
-
|
|
local file_type=$(platform_identify "$1")
|
|
|
|
[ "$(platform_flash_type)" != "nand" ] && return
|