From c2cd4e8a6231e0df6cecdc162aea09bf6e3f05c8 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.com>
Date: Tue, 13 May 2025 07:41:10 +0100
Subject: [PATCH] bookworm -> trixie

---
 README.md        | 4 ++--
 build-docker.sh  | 6 +++---
 build.sh         | 2 +-
 stage0/prerun.sh | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 2c1a1bd..71e5325 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ environment variables.
 
 The following environment variables are supported:
 
- * `IMG_NAME` (Default: `raspios-$RELEASE-$ARCH`, for example: `raspios-bookworm-armhf`)
+ * `IMG_NAME` (Default: `raspios-$RELEASE-$ARCH`, for example: `raspios-trixie-armhf`)
 
    The name of the image to build with the current stage directories. Use this
    variable to set the root name of your OS, eg `IMG_NAME=Frobulator`.
@@ -66,7 +66,7 @@ The following environment variables are supported:
    The release name to use in `/etc/issue.txt`. The default should only be used
    for official Raspberry Pi builds.
 
-* `RELEASE` (Default: `bookworm`)
+* `RELEASE` (Default: `trixie`)
 
    The release version to build images against. Valid values are any supported
    Debian release. However, since different releases will have different sets of
diff --git a/build-docker.sh b/build-docker.sh
index 0591c34..9c04651 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -85,10 +85,10 @@ BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 # Check the arch of the machine we're running on. If it's 64-bit, use a 32-bit base image instead
 case "$(uname -m)" in
   x86_64|aarch64)
-    BASE_IMAGE=i386/debian:bookworm
+    BASE_IMAGE=i386/debian:trixie
     ;;
   *)
-    BASE_IMAGE=debian:bookworm
+    BASE_IMAGE=debian:trixie
     ;;
 esac
 ${DOCKER} build --build-arg BASE_IMAGE=${BASE_IMAGE} -t pi-gen "${DIR}"
@@ -151,7 +151,7 @@ time ${DOCKER} run \
   pi-gen \
   bash -e -o pipefail -c "
     dpkg-reconfigure qemu-user-static &&
-    # binfmt_misc is sometimes not mounted with debian bookworm image
+    # binfmt_misc is sometimes not mounted with debian trixie image
     (mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true) &&
     cd /pi-gen; ./build.sh ${BUILD_OPTS} &&
     rsync -av work/*/build.log deploy/
diff --git a/build.sh b/build.sh
index 4d3902c..23f9585 100755
--- a/build.sh
+++ b/build.sh
@@ -176,7 +176,7 @@ export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen}
 export PI_GEN_RELEASE=${PI_GEN_RELEASE:-Raspberry Pi reference}
 
 export ARCH=armhf
-export RELEASE=${RELEASE:-bookworm} # Don't forget to update stage0/prerun.sh
+export RELEASE=${RELEASE:-trixie} # Don't forget to update stage0/prerun.sh
 export IMG_NAME="${IMG_NAME:-raspios-$RELEASE-$ARCH}"
 
 export USE_QEMU="${USE_QEMU:-0}"
diff --git a/stage0/prerun.sh b/stage0/prerun.sh
index 5f0bd2c..c625b0e 100755
--- a/stage0/prerun.sh
+++ b/stage0/prerun.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-if [ "$RELEASE" != "bookworm" ]; then
+if [ "$RELEASE" != "trixie" ]; then
 	echo "WARNING: RELEASE does not match the intended option for this branch."
 	echo "         Please check the relevant README.md section."
 fi