mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2026-03-09 02:37:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

iop: ssh_upgrade: Don't hardcode subtarget to generic

Browse source 
Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
This commit is contained in:
Andreas Gnau 2022-07-20 18:12:14 +02:00
parent 30bfe70fb3
commit 3a7d8b1c51
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iop/scripts/iopupgrade.sh
View file

@ -51,9 +51,8 @@ function upd_ask_ok {
}
function upd_select_file {
dialog --keep-tite --title "To select file use TAB/ARROW to hilight then press SPACEBAR -> RETURN" \
--fselect "bin/targets/$CONFIG_TARGET_BOARD/generic/" \
--fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \
$((lines - 10)) $((cols - 5)) \
2>$tempfile
@ -247,15 +246,16 @@ function ssh_upgrade {
upd_fw_base=$(basename $upd_fw)
else
set_config_string CONFIG_TARGET_BOARD
set_config_string CONFIG_TARGET_SUBTARGET
firmwares=$(
cd bin/targets/$CONFIG_TARGET_BOARD/generic/
cd "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"
ls -t *[0-9].y[3]
)
# if target uses pkgtb
if [ -z "$firmwares"]; then
firmwares=$(
cd bin/targets/$CONFIG_TARGET_BOARD/generic/
cd bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/
ls -t last.pkgtb
)
fi
@ -264,7 +264,7 @@ function ssh_upgrade {
#echo "firmware $upd_fw"
break
done
upd_fw="bin/targets/$CONFIG_TARGET_BOARD/generic/$upd_fw_base"
upd_fw="bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/$upd_fw_base"
fi
[ $do_dialog -eq 1 ] && upd_select_start