diff options
author | John Crispin <blogic@openwrt.org> | 2015-06-05 14:12:15 +0000 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2015-06-05 14:12:15 +0000 |
commit | 1a05fc5f497fa6ec03563d9b34cac85325744509 (patch) | |
tree | 41431649465401aaf1986decbf3e40617f8f1ca8 /target/linux/brcm47xx | |
parent | d831148740739687eba9fb54d7e8414dc41037f4 (diff) | |
download | master-187ad058-1a05fc5f497fa6ec03563d9b34cac85325744509.tar.gz master-187ad058-1a05fc5f497fa6ec03563d9b34cac85325744509.tar.bz2 master-187ad058-1a05fc5f497fa6ec03563d9b34cac85325744509.zip |
brcm47xx: extract TRX from image on the fly
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 <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45901 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r-- | target/linux/brcm47xx/base-files/lib/upgrade/platform.sh | 15 |
1 files 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 a346933f9a..14fd5c814d 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" } |