From c08fe9f5227f439e8a9ac7f0d9f7d186bc449415 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Thu, 17 Aug 2023 16:31:09 +0200
Subject: [PATCH] post-image: Defer RAUC status file generation to disk image
 creation

In the future we want to build disk images from builds where we
haven't locally built Infix, we've just downloaded an existing
release. In those cases we also have to create rauc.status, even
though we're not creating a bundle.
---
 board/common/mkrauc-status.sh | 35 ++++++++++++++++++++++++++++++++++
 board/common/mkrauc.sh        | 36 +----------------------------------
 board/common/post-image.sh    |  4 +++-
 3 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100755 board/common/mkrauc-status.sh

diff --git a/board/common/mkrauc-status.sh b/board/common/mkrauc-status.sh
new file mode 100755
index 00000000..0560e79c
--- /dev/null
+++ b/board/common/mkrauc-status.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+# Bootstrap a RAUC status file showing the newly created image
+# installed to both the primary and secondary slots. This then bundled
+# in the aux partition in mkdisk.sh, so that RAUC (on the target) can
+# always report the installed versions.
+rauc info --no-verify --output-format=shell $1 >/tmp/rauc-$$.info
+. /tmp/rauc-$$.info
+rm /tmp/rauc-$$.info
+tstamp=$(date -u +%FT%TZ)
+cat <<EOF
+[slot.rootfs.0]
+bundle.compatible=$RAUC_MF_COMPATIBLE
+bundle.version=$RAUC_MF_VERSION
+status=ok
+sha256=$RAUC_IMAGE_DIGEST_0
+size=$RAUC_IMAGE_SIZE_0
+installed.timestamp=$tstamp
+installed.count=1
+activated.timestamp=$tstamp
+activated.count=1
+
+[slot.rootfs.1]
+bundle.compatible=$RAUC_MF_COMPATIBLE
+bundle.version=$RAUC_MF_VERSION
+status=ok
+sha256=$RAUC_IMAGE_DIGEST_0
+size=$RAUC_IMAGE_SIZE_0
+installed.timestamp=$tstamp
+installed.count=1
+activated.timestamp=$tstamp
+activated.count=1
+EOF
diff --git a/board/common/mkrauc.sh b/board/common/mkrauc.sh
index b52b1204..7c71dbbb 100755
--- a/board/common/mkrauc.sh
+++ b/board/common/mkrauc.sh
@@ -3,11 +3,8 @@
 set -e
 
 GIT_VERSION=$(git -C $BR2_EXTERNAL_INFIX_PATH describe --always --dirty --tags)
-if [ -n "$INFIX_RELEASE" ]; then
-    rel="-${INFIX_RELEASE}"
-fi
 
-name=$1${rel}
+name=$1
 arch=$2
 sign=$3
 
@@ -46,34 +43,3 @@ rm -f $BINARIES_DIR/$name.pkg
 
 rauc --cert=$crt --key=$key \
     bundle $work $BINARIES_DIR/$name.pkg
-
-# Bootstrap a RAUC status file showing the newly created image
-# installed to both the primary and secondary slots. This then bundled
-# in the aux partition in mkdisk.sh, so that RAUC (on the target) can
-# always report the installed versions.
-rauc info --no-verify --output-format=shell $BINARIES_DIR/$name.pkg >$work/rauc.info
-. $work/rauc.info
-tstamp=$(date -u +%FT%TZ)
-cat >$work/rauc.status <<EOF
-[slot.rootfs.0]
-bundle.compatible=$RAUC_MF_COMPATIBLE
-bundle.version=$RAUC_MF_VERSION
-status=ok
-sha256=$RAUC_IMAGE_DIGEST_0
-size=$RAUC_IMAGE_SIZE_0
-installed.timestamp=$tstamp
-installed.count=1
-activated.timestamp=$tstamp
-activated.count=1
-
-[slot.rootfs.1]
-bundle.compatible=$RAUC_MF_COMPATIBLE
-bundle.version=$RAUC_MF_VERSION
-status=ok
-sha256=$RAUC_IMAGE_DIGEST_0
-size=$RAUC_IMAGE_SIZE_0
-installed.timestamp=$tstamp
-installed.count=1
-activated.timestamp=$tstamp
-activated.count=1
-EOF
diff --git a/board/common/post-image.sh b/board/common/post-image.sh
index 92ff7358..74f3ce07 100755
--- a/board/common/post-image.sh
+++ b/board/common/post-image.sh
@@ -2,6 +2,7 @@
 common=$(dirname "$(readlink -f "$0")")
 . $common/lib.sh
 
+load_cfg BR2_ARCH
 load_cfg BR2_DEFCONFIG
 load_cfg BR2_EXTERNAL_INFIX_PATH
 NAME=infix-$(basename "$BR2_DEFCONFIG" _defconfig | tr _ - | sed 's/x86-64/x86_64/')
@@ -23,13 +24,14 @@ if [ "$SIGN_ENABLED" = "y" ]; then
     $common/sign.sh $BR2_ARCH $SIGN_KEY
 
     ixmsg "Creating RAUC Update Bundle"
-    $common/mkrauc.sh $NAME $BR2_ARCH $SIGN_KEY
+    $common/mkrauc.sh "$NAME$(ver)" $BR2_ARCH $SIGN_KEY
 fi
 
 load_cfg DISK_IMAGE
 load_cfg DISK_IMAGE_SIZE
 if [ "$DISK_IMAGE" = "y" ]; then
     ixmsg "Creating Disk Image"
+    $common/mkrauc-status.sh "$BINARIES_DIR/${NAME}.pkg" >"$BINARIES_DIR/rauc.status"
     $common/mkdisk.sh -a $BR2_ARCH -s $DISK_IMAGE_SIZE
 fi