domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm53xx: sysupgrade: simplify extracting image from Seama seal

Browse Source 
Use "oseama extract" which supports now writing to stdout.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit e7bd6cce4c)
This commit is contained in:
Rafał Miłecki
2021-11-26 18:01:50 +01:00
parent 0ebf62e7f4
commit 29f73a7968
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
View File

@@ -396,20 +396,8 @@ platform_img_from_safeloader() {
echo -n $dir/os-image echo -n $dir/os-image
} }
platform_img_from_seama() { platform_img_from_seama_cmd() {
local dir="/tmp/sysupgrade-bcm53xx" echo -n oseama extract "$1" -e 0
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_other_do_upgrade() { platform_other_do_upgrade() {
@@ -438,7 +426,7 @@ platform_other_do_upgrade() {
"lxl") cmd=$(platform_trx_from_lxl_cmd "$trx");; "lxl") cmd=$(platform_trx_from_lxl_cmd "$trx");;
"lxlold") cmd=$(platform_trx_from_lxlold_cmd "$trx");; "lxlold") cmd=$(platform_trx_from_lxlold_cmd "$trx");;
"safeloader") trx=$(platform_img_from_safeloader "$trx"); PART_NAME=os-image;; "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 esac
default_do_upgrade "$trx" "$cmd" default_do_upgrade "$trx" "$cmd"