bcm53xx: upgrade: fix RAMFS_COPY_*
authorMatthias Schiffer <mschiffer@universe-factory.net>
Sat, 10 Jun 2017 14:14:54 +0000 (16:14 +0200)
committerMatthias Schiffer <mschiffer@universe-factory.net>
Tue, 11 Jul 2017 15:19:23 +0000 (17:19 +0200)
Fixes: 30f61a34b4cf "base-files: always use staged sysupgrade"
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
package/base-files/files/lib/upgrade/stage2
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh

index bdbb8926643287f48a4ae62c5d1d4b4a29130859..9d12cc801cf97b8adb2a28b0dc43a198ede2f315 100755 (executable)
@@ -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/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
 
        install_bin /sbin/mtd
        install_bin /sbin/mount_root
index f2e007db22fa8fde93bf0dd58b359f6515e0445c..6a9e4950450cb896db7ebb3eb901b5cf51030295 100644 (file)
@@ -1,3 +1,5 @@
+RAMFS_COPY_BIN='/usr/bin/osafeloader /usr/bin/oseama'
+
 PART_NAME=firmware
 
 # $(1): file to read magic from
 PART_NAME=firmware
 
 # $(1): file to read magic from
@@ -260,8 +262,6 @@ platform_pre_upgrade_seama() {
 }
 
 platform_pre_upgrade() {
 }
 
 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
        local file_type=$(platform_identify "$1")
 
        [ "$(platform_flash_type)" != "nand" ] && return