bookworm -> trixie
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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/
|
||||
|
||||
2
build.sh
2
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}"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user