From 781ac485559658f0668a1f46ce105ea1d42e4fee Mon Sep 17 00:00:00 2001
From: Matthew Lear <matthew.lear@raspberrypi.com>
Date: Mon, 1 Dec 2025 15:29:50 +0000
Subject: [PATCH 1/2] runner: post-image should not be mutually exclusive

While runner can support X|Y logic for hooks, since the generic
post-image hook creates the IDP JSON, we want both image specific
and generic post-image hooks to run.
Other hooks are not mutually exclusive, so remove the logic for
post-image since it serves no purpose.
---
 bin/runner | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/runner b/bin/runner
index 0555cae6..609a0ec9 100755
--- a/bin/runner
+++ b/bin/runner
@@ -44,8 +44,8 @@ IGROOT:pre-image.sh \
 SRCROOT:pre-image.sh"
 
    [post-image]="\
-DEVICE_ASSET:post-image.sh|IGROOT_device:post-image.sh \
-IMAGE_ASSET:post-image.sh|IGROOT_image:post-image.sh \
+DEVICE_ASSET:post-image.sh IGROOT_device:post-image.sh \
+IMAGE_ASSET:post-image.sh IGROOT_image:post-image.sh \
 IGROOT:post-image.sh \
 SRCROOT:post-image.sh"
 

From be461c8a4ae74a567e0619e0573a4226c91b1313 Mon Sep 17 00:00:00 2001
From: Matthew Lear <matthew.lear@raspberrypi.com>
Date: Mon, 1 Dec 2025 14:38:50 +0000
Subject: [PATCH 2/2] AB: Pack slot archive in post-build

---
 image/gpt/ab_userdata/post-image.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100755 image/gpt/ab_userdata/post-image.sh

diff --git a/image/gpt/ab_userdata/post-image.sh b/image/gpt/ab_userdata/post-image.sh
new file mode 100755
index 00000000..6791e90c
--- /dev/null
+++ b/image/gpt/ab_userdata/post-image.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eu
+
+upd="${1}/update"
+rm -rf $upd
+mkdir -p $upd
+
+[[ -f ${1}/system.sparse ]] || false
+[[ -f ${1}/boot.sparse ]] || false
+
+ln -sf ../system.sparse ${upd}/system
+ln -sf ../boot.sparse ${upd}/boot
+
+msg "Packing..."
+cd $upd && tar -I zstd -h -cf  ${1}/update.tar.zst -- *