From a1771ff5c685dcedbd13e79f00641b6a1c289bbd Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 23 Oct 2024 10:03:22 +0200 Subject: [PATCH] board/common: use INFIX_COMPATIBLE also in rauc.status Follow-up to cedb654, issue #755. Signed-off-by: Joachim Wiberg --- board/common/post-image.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/board/common/post-image.sh b/board/common/post-image.sh index cebc9f9e9..b57aad188 100755 --- a/board/common/post-image.sh +++ b/board/common/post-image.sh @@ -7,11 +7,14 @@ common=$(dirname "$(readlink -f "$0")") # shellcheck disable=SC1091 . "$TARGET_DIR/etc/os-release" -load_cfg INFIX_ID +# The INFIX_* variables may be composed from BR2_* variables, +# so we source them last. load_cfg BR2_ARCH load_cfg BR2_DEFCONFIG load_cfg BR2_EXTERNAL_INFIX_PATH load_cfg BR2_TARGET_ROOTFS +load_cfg INFIX_ID +load_cfg INFIX_COMPATIBLE # The default IMAGE_ID is infix-$BR2_ARCH but can be overridden # for imaage names, and compat strings, like infix-r2s @@ -39,7 +42,7 @@ if [ "$SIGN_ENABLED" = "y" ]; then $common/sign.sh $BR2_ARCH $SIGN_KEY ixmsg "Creating RAUC Update Bundle" - $common/mkrauc.sh "$NAME$(ver)" $NAME $SIGN_KEY + $common/mkrauc.sh "$NAME$(ver)" $INFIX_COMPATIBLE $SIGN_KEY fi load_cfg DISK_IMAGE