Extracting TRX to separated file in /tmp/ requires extra RAM which may
not be available on some chepaer devices. Instead of that lets pass a
proper extracting command to the default_do_upgrade.
Signed-off-by: Rafał Miłecki <zaj...@gmail.com>
---
V2: Add this patch to show why we need 1/2 :)
---
target/linux/brcm47xx/base-files/lib/upgrade/platform.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index a346933..14fd5c8 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -133,25 +133,26 @@ platform_check_image() {
return $error
}
-platform_extract_trx_from_chk() {
+platform_trx_from_chk_cmd() {
local header_len=$((0x$(get_magic_long_at "$1" 4)))
- dd if="$1" of="$2" bs=$header_len skip=1
+ echo -n dd bs=$header_len skip=1
}
-platform_extract_trx_from_cybertan() {
- dd if="$1" of="$2" bs=32 skip=1
+platform_trx_from_cybertan_cmd() {
+ echo -n dd bs=32 skip=1
}
platform_do_upgrade() {
local file_type=$(brcm47xx_identify "$1")
local trx="$1"
+ local cmd=""
case "$file_type" in
- "chk") trx="/tmp/$(basename $1).trx";
platform_extract_trx_from_chk "$1" "$trx";;
- "cybertan") trx="/tmp/$(basename $1).trx";
platform_extract_trx_from_cybertan "$1" "$trx";;
+ "chk") cmd=$(platform_trx_from_chk_cmd "$trx");;
+ "cybertan") cmd=$(platform_trx_from_cybertan_cmd "$trx");;
esac
shift
- default_do_upgrade "$trx" "$@"
+ default_do_upgrade "$trx" "$cmd"
}
--
1.8.4.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
