diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2021-11-26 18:01:50 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2021-12-13 14:01:14 +0100 |
| commit | 29f73a79689bc872132f4202724d3139a7b449f9 (patch) | |
| tree | 23129412afc34662b27a1ed7f24ba543628f6db4 | |
| parent | 0ebf62e7f4a62a3bee76428794c9d90569e42715 (diff) | |
| download | upstream-29f73a79689bc872132f4202724d3139a7b449f9.tar.gz upstream-29f73a79689bc872132f4202724d3139a7b449f9.tar.bz2 upstream-29f73a79689bc872132f4202724d3139a7b449f9.zip | |
bcm53xx: sysupgrade: simplify extracting image from Seama seal
Use "oseama extract" which supports now writing to stdout.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit e7bd6cce4c382e33a62c462bf07bafba23b22e1a)
| -rw-r--r-- | target/linux/bcm53xx/base-files/lib/upgrade/platform.sh | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh index cbb8290275..0973e4048b 100644 --- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh @@ -396,20 +396,8 @@ platform_img_from_safeloader() { echo -n $dir/os-image } -platform_img_from_seama() { - local dir="/tmp/sysupgrade-bcm53xx" - local offset=$(oseama info "$1" -e 0 | grep "Entity offset:" | sed "s/.*:\s*//") - local size=$(oseama info "$1" -e 0 | grep "Entity size:" | sed "s/.*:\s*//") - - # Busybox doesn't support required iflag-s - # echo -n dd iflag=skip_bytes,count_bytes skip=$offset count=$size - - rm -fR $dir - mkdir -p $dir - dd if="$1" of=$dir/image-noheader.bin bs=$offset skip=1 - dd if=$dir/image-noheader.bin of=$dir/image-entity.bin bs=$size count=1 - - echo -n $dir/image-entity.bin +platform_img_from_seama_cmd() { + echo -n oseama extract "$1" -e 0 } platform_other_do_upgrade() { @@ -438,7 +426,7 @@ platform_other_do_upgrade() { "lxl") cmd=$(platform_trx_from_lxl_cmd "$trx");; "lxlold") cmd=$(platform_trx_from_lxlold_cmd "$trx");; "safeloader") trx=$(platform_img_from_safeloader "$trx"); PART_NAME=os-image;; - "seama") trx=$(platform_img_from_seama "$trx");; + "seama") cmd=$(platform_img_from_seama_cmd "$trx");; esac default_do_upgrade "$trx" "$cmd" |