| 123456789101112131415161718192021222324252627282930313233343536373839 |
- 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 eb6dc823e3890497389716c32ec7e4caf8d30c45..a90a58299dc293afbe15a0b491ef6898402deca4 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
|
