From 31e2e7ccb8f9971464f2e638e7d4eaf53753ef5f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 14 Feb 2022 14:24:21 +0000 Subject: [PATCH] auc: fall back to 'sdcard' image Fallback to use 'sdcard' image in case there is neither 'sysupgrade' nor 'combined' image available. This allows using 'auc' on targets where 'sdcard' image is also used for sysupgrade (such as some mvebu-based devices with eMMC). Signed-off-by: Daniel Golle (cherry picked from commit 6b041752a00d125a4e651aa56f6abae0e06a59b6) --- utils/auc/src/auc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utils/auc/src/auc.c b/utils/auc/src/auc.c index 6a78d2db82..cd2acc5225 100644 --- a/utils/auc/src/auc.c +++ b/utils/auc/src/auc.c @@ -1363,6 +1363,10 @@ static int select_image(struct blob_attr *images, const char *target_fstype, cha ret = get_image_by_type(images, combined_type, fstype, image_name, image_sha256); if (!ret) return 0; + + ret = get_image_by_type(images, "sdcard", fstype, image_name, image_sha256); + if (!ret) + return 0; } /* fallback to squashfs unless fstype requested explicitly */ @@ -1372,6 +1376,10 @@ static int select_image(struct blob_attr *images, const char *target_fstype, cha return 0; ret = get_image_by_type(images, combined_type, "squashfs", image_name, image_sha256); + if (!ret) + return 0; + + ret = get_image_by_type(images, "sdcard", fstype, image_name, image_sha256); } return ret; -- 2.30.2