Skip to content
Snippets Groups Projects
Verified Commit e6f1aeb6 authored by Andreas Gnau's avatar Andreas Gnau :speech_balloon:
Browse files

airoha: Get rid of unintended prints during sysupgrade


During image verification before sysupgrade, the line "bootloader-emmc"
was printed to the output of platform_check_image. When supplied with a
pre-7.1.0ALPHA3 image squashfs could be printed.  Silence the output of
the offending command.

Signed-off-by: default avatarAndreas Gnau <andreas.gnau@iopsys.eu>
parent 5c174cce
Branches
No related tags found
1 merge request!1416airoha: Get rid of unintended prints during sysupgrade
...@@ -11,12 +11,11 @@ platform_check_image() { ...@@ -11,12 +11,11 @@ platform_check_image() {
__check_image_emmc_gpt_support "$image" "$board_name" || return __check_image_emmc_gpt_support "$image" "$board_name" || return
} }
__check_image_emmc_gpt_support() { __check_image_emmc_gpt_support() {
local image=$1 local image=$1
local board_name=$2 local board_name=$2
local configuration="$(get_configuration "$image" "$board_name")" || return 1 local configuration="$(get_configuration "$image" "$board_name")" || return 1
if [ "$(get_root_device_type)" = emmc ] && ! get_image_component_ref "$image" bootloader-emmc "$configuration" ; then if [ "$(get_root_device_type)" = emmc ] && ! get_image_component_ref "$image" bootloader-emmc "$configuration" >/dev/null; then
log "ERROR: Can not downgrade to image with missing eMMC GPT support." log "ERROR: Can not downgrade to image with missing eMMC GPT support."
return 1 return 1
fi fi
...@@ -32,7 +31,7 @@ __check_image_70_65_downgrade() { ...@@ -32,7 +31,7 @@ __check_image_70_65_downgrade() {
# those images did not have configs to begin with # those images did not have configs to begin with
# shellcheck disable=SC2155 # shellcheck disable=SC2155
local configuration="$(get_configuration "$image" "$board_name")" local configuration="$(get_configuration "$image" "$board_name")"
if get_image_component_ref "$image" squashfs "$configuration"; then if get_image_component_ref "$image" squashfs "$configuration" >/dev/null; then
log "ERROR: Downgrading to a version older than 7.1.0ALPHA3 is not supported." log "ERROR: Downgrading to a version older than 7.1.0ALPHA3 is not supported."
return 1 return 1
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment