From 6e8dcbfd22b6035c982b124ff336089c7114a66a Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Tue, 13 May 2025 07:43:36 +0100
Subject: [PATCH 1/2] Update release notes

---
 export-noobs/00-release/files/release_notes.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/export-noobs/00-release/files/release_notes.txt b/export-noobs/00-release/files/release_notes.txt
index 6cfb9d9..3223355 100644
--- a/export-noobs/00-release/files/release_notes.txt
+++ b/export-noobs/00-release/files/release_notes.txt
@@ -1,4 +1,6 @@
 UNRELEASED:
+  *
+2025-05-13:
   * Setting touchscreen in Screen Configuration does not delete default associations for greeter
   * Bug fix - wizard keyboard setting correctly transferred into desktop
   * Chromium updated to 136.0.7103.92

From e9c2afbdacb57169f70be64e6f6e2bbc8459cb1b Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Tue, 13 May 2025 07:45:25 +0100
Subject: [PATCH 2/2] export-image: Check if bmap file exists before copying

---
 export-image/05-finalise/01-run.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/export-image/05-finalise/01-run.sh b/export-image/05-finalise/01-run.sh
index 5cbda20..860b97f 100755
--- a/export-image/05-finalise/01-run.sh
+++ b/export-image/05-finalise/01-run.sh
@@ -135,5 +135,7 @@ esac
 if [ -f "${SBOM_FILE}" ]; then
 	xz -c "${SBOM_FILE}" > "$DEPLOY_DIR/$(basename "${SBOM_FILE}").xz"
 fi
-cp "$BMAP_FILE" "$DEPLOY_DIR/"
+if [ -f "${BMAP_FILE}" ]; then
+	cp "$BMAP_FILE" "$DEPLOY_DIR/"
+fi
 cp "$INFO_FILE" "$DEPLOY_DIR/"