From c2cd4e8a6231e0df6cecdc162aea09bf6e3f05c8 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 13 May 2025 07:41:10 +0100 Subject: [PATCH 01/27] 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 From ec789c7b7888eaefea53013265f9cace166550e1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:26:18 +0100 Subject: [PATCH 02/27] Remove obsolete packages --- stage2/01-sys-tweaks/00-packages | 3 +-- stage3/00-install-packages/00-packages | 3 +-- stage4/00-install-packages/00-packages | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index f06f7d0..d5d2856 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -5,7 +5,7 @@ python-is-python3 v4l-utils gpiod python3-libgpiod python3-gpiozero -pigpio python3-pigpio raspi-gpio python3-rpi-lgpio +python3-rpi-lgpio python3-spidev python3-smbus2 avahi-daemon @@ -25,7 +25,6 @@ libmtp-runtime rsync htop man-db -policykit-1 ssh-import-id ethtool ntfs-3g diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages index 329b6fe..e3e2e0c 100644 --- a/stage3/00-install-packages/00-packages +++ b/stage3/00-install-packages/00-packages @@ -1,8 +1,7 @@ -gstreamer1.0-x gstreamer1.0-omx gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav +gstreamer1.0-x gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-libav evince gtk2-engines alsa-utils desktop-base git -policykit-1 gvfs rfkill chromium rpi-chromium-mods libwidevinecdm0 diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 453a2fd..812fe81 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -8,10 +8,9 @@ python3-pip python3-numpy rc-gui sense-hat tree -libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr +libgl1-mesa-dri libgles1 xcompmgr geany piclone -python3-twython python3-flask pprompt piwiz From d8ff34585ce42e188ca6f6274807879891a33352 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 14:00:28 +0100 Subject: [PATCH 03/27] Refresh patches --- stage1/01-sys-tweaks/00-patches/01-bashrc.diff | 10 +++++----- .../01-sys-tweaks/00-patches/01-useradd.diff | 8 +++----- .../01-sys-tweaks/00-patches/04-inputrc.diff | 8 +++----- stage2/01-sys-tweaks/00-patches/05-path.diff | 18 +++++++----------- 4 files changed, 18 insertions(+), 26 deletions(-) diff --git a/stage1/01-sys-tweaks/00-patches/01-bashrc.diff b/stage1/01-sys-tweaks/00-patches/01-bashrc.diff index efa2104..86d351f 100644 --- a/stage1/01-sys-tweaks/00-patches/01-bashrc.diff +++ b/stage1/01-sys-tweaks/00-patches/01-bashrc.diff @@ -1,6 +1,6 @@ ---- a/rootfs/etc/skel/.bashrc -+++ b/rootfs/etc/skel/.bashrc -@@ -43,7 +43,7 @@ +--- stage1.orig/rootfs/etc/skel/.bashrc ++++ stage1/rootfs/etc/skel/.bashrc +@@ -43,7 +43,7 @@ esac # uncomment for a colored prompt, if the terminal has the capability; turned # off by default to not distract the user: the focus in a terminal window # should be on the output of commands, not on the prompt @@ -9,7 +9,7 @@ if [ -n "$force_color_prompt" ]; then if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then -@@ -57,7 +57,7 @@ +@@ -57,7 +57,7 @@ if [ -n "$force_color_prompt" ]; then fi if [ "$color_prompt" = yes ]; then @@ -18,7 +18,7 @@ else PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' fi -@@ -79,9 +79,9 @@ +@@ -79,9 +79,9 @@ if [ -x /usr/bin/dircolors ]; then #alias dir='dir --color=auto' #alias vdir='vdir --color=auto' diff --git a/stage2/01-sys-tweaks/00-patches/01-useradd.diff b/stage2/01-sys-tweaks/00-patches/01-useradd.diff index e81ad5a..cc3476b 100644 --- a/stage2/01-sys-tweaks/00-patches/01-useradd.diff +++ b/stage2/01-sys-tweaks/00-patches/01-useradd.diff @@ -1,9 +1,7 @@ -Index: jessie-stage2/rootfs/etc/default/useradd -=================================================================== ---- jessie-stage2.orig/rootfs/etc/default/useradd -+++ jessie-stage2/rootfs/etc/default/useradd +--- stage2.orig/rootfs/etc/default/useradd ++++ stage2/rootfs/etc/default/useradd @@ -5,7 +5,7 @@ - # Similar to DHSELL in adduser. However, we use "sh" here because + # Similar to DSHELL in adduser. However, we use "sh" here because # useradd is a low level utility and should be as general # as possible -SHELL=/bin/sh diff --git a/stage2/01-sys-tweaks/00-patches/04-inputrc.diff b/stage2/01-sys-tweaks/00-patches/04-inputrc.diff index c81fa62..1da12c5 100644 --- a/stage2/01-sys-tweaks/00-patches/04-inputrc.diff +++ b/stage2/01-sys-tweaks/00-patches/04-inputrc.diff @@ -1,8 +1,6 @@ -Index: jessie-stage2/rootfs/etc/inputrc -=================================================================== ---- jessie-stage2.orig/rootfs/etc/inputrc -+++ jessie-stage2/rootfs/etc/inputrc -@@ -65,3 +65,7 @@ $endif +--- stage2.orig/rootfs/etc/inputrc ++++ stage2/rootfs/etc/inputrc +@@ -69,3 +69,7 @@ $endif # "\e[F": end-of-line $endif diff --git a/stage2/01-sys-tweaks/00-patches/05-path.diff b/stage2/01-sys-tweaks/00-patches/05-path.diff index 25b80a1..38d7fc3 100644 --- a/stage2/01-sys-tweaks/00-patches/05-path.diff +++ b/stage2/01-sys-tweaks/00-patches/05-path.diff @@ -1,8 +1,6 @@ -Index: jessie-stage2/rootfs/etc/login.defs -=================================================================== ---- jessie-stage2.orig/rootfs/etc/login.defs -+++ jessie-stage2/rootfs/etc/login.defs -@@ -100,7 +100,7 @@ HUSHLOGIN_FILE .hushlogin +--- stage2.orig/rootfs/etc/login.defs ++++ stage2/rootfs/etc/login.defs +@@ -60,7 +60,7 @@ HUSHLOGIN_FILE .hushlogin # # (they are minimal, add the rest in the shell startup files) ENV_SUPATH PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin @@ -10,13 +8,11 @@ Index: jessie-stage2/rootfs/etc/login.defs +ENV_PATH PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games # - # Terminal permissions -Index: jessie-stage2/rootfs/etc/profile -=================================================================== ---- jessie-stage2.orig/rootfs/etc/profile -+++ jessie-stage2/rootfs/etc/profile + # Terminal permissions for terminals after login(1). +--- stage2.orig/rootfs/etc/profile ++++ stage2/rootfs/etc/profile @@ -4,7 +4,7 @@ - if [ "`id -u`" -eq 0 ]; then + if [ "$(id -u)" -eq 0 ]; then PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" else - PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" From 56d7e30356aad8adc72d4cc45d4bd565bf065ceb Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 5 Jun 2025 22:04:34 +0100 Subject: [PATCH 04/27] stage0: modernise apt sources --- stage0/00-configure-apt/00-run.sh | 12 +++---- .../files/raspberrypi-archive-keyring.pgp | Bin 0 -> 1229 bytes .../files/raspberrypi.gpg.key | 30 ------------------ .../00-configure-apt/files/raspbian.sources | 6 ++++ stage0/00-configure-apt/files/raspi.list | 3 -- stage0/00-configure-apt/files/raspi.sources | 5 +++ stage0/00-configure-apt/files/sources.list | 3 -- 7 files changed, 17 insertions(+), 42 deletions(-) create mode 100644 stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp delete mode 100644 stage0/00-configure-apt/files/raspberrypi.gpg.key create mode 100644 stage0/00-configure-apt/files/raspbian.sources delete mode 100644 stage0/00-configure-apt/files/raspi.list create mode 100644 stage0/00-configure-apt/files/raspi.sources delete mode 100644 stage0/00-configure-apt/files/sources.list diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh index 1b7e03f..8e47893 100755 --- a/stage0/00-configure-apt/00-run.sh +++ b/stage0/00-configure-apt/00-run.sh @@ -1,9 +1,10 @@ #!/bin/bash -e -install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/" -install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/" -sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list" -sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspi.list" +true > "${ROOTFS_DIR}/etc/apt/sources.list" +install -m 644 files/raspbian.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/" +install -m 644 files/raspi.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/" +sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspbian.sources" +sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list.d/raspi.sources" if [ -n "$APT_PROXY" ]; then install -m 644 files/51cache "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache" @@ -19,8 +20,7 @@ else rm -f "${ROOTFS_DIR}/etc/apt/sources.list.d/00-temp.list" fi -cat files/raspberrypi.gpg.key | gpg --dearmor > "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg" -install -m 644 "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg" "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/" +install -m 644 files/raspberrypi-archive-keyring.pgp "${ROOTFS_DIR}/usr/share/keyrings/" on_chroot <<- \EOF ARCH="$(dpkg --print-architecture)" if [ "$ARCH" = "armhf" ]; then diff --git a/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp b/stage0/00-configure-apt/files/raspberrypi-archive-keyring.pgp new file mode 100644 index 0000000000000000000000000000000000000000..e0ada06a3ab4633137053188d6cc1f77b77237a8 GIT binary patch literal 1229 zcmV;;1Ty=X0SyFC-R_S82mq_Xq#AHyU!QwtGcm4R@PLL6L4LMVuSDD}S^bWgD(f z8w646R_0hcFid6w?MWv(jM768U&qzSWkZrTA!qok;;q3vaYXnZGm3m&Gv>jivG za7)9LBadobb$$-gJ~#86|Z)G z%BB^`+S8wsy9fV7c=WY-joOX{Q!R*+W?gmROUaxU z7FsW6NcFPo9igUgK9i3uQv@!2+^Ene@Q!|sQbt<1n_aq8A>(K6%j}w_L80^CnKFMj z){NawuVg!ZH9w?iKeQD_v$lmfzcq@GI|!jDN)JB!0*E| zR1S`BKj&MV(O&7-57t+4t7(S#K^v_)vnqI8r(oL8R#GI!m}O0r?XO2?0EunbM%80{ zy)JFF;NA|)C5U6IEtW4rLBj8RaigBr#On)CH2eNTSk_%FZ2qA{o1MuzL#IzbO3cID ziM-hNZXJW9S${egg+LewIUiFAOnO_U;ZuaU0SyFC-R_S82msBMTR~+`w|;K@N-^Q& z0SXq)0^Up-(qo~g+8VR?S`G*%h9%w2;P>OwR?pT`$Lr-ztt|MDry(6$`mcsB=y77+ z2ZtH}>iI)4=oNnUO3tL$^xF1Tq#8?tv)yh~F8?*R4c4Oqx{E^lrl97$I-r}q<}tSM zd~ozjB<=I(V0u8BWhP`FdM#k_Gk{t|iYFl8KWYuN^`RI6lq4y!DiHodlHiTVs zmKVD+3!a~fXq=A|kddiIIVL8~4|AHQ-Gq^WJda`2Ha2rlRKM%_V z{StVH?cZ8Y6gC3}xRmnG8V9&HJo|#$+H`ZU^qJt@!iD7b@X@?=l417nkhPm^VkoI) z<`gPBPN@NhO_I`W#Gh4OIK-h;0U7F8b%5s9LY+%2LlpNH7gBK--b4G$k|T33u+z^X-@uF=}@y}U?3zm5}_g}8BLJaY04{3y5jAK rq0n^PVPsRhSmx5asCT{8;kQBkkMMxVk~}~jdn$g9KdA&yNRPmcGkH4) literal 0 HcmV?d00001 diff --git a/stage0/00-configure-apt/files/raspberrypi.gpg.key b/stage0/00-configure-apt/files/raspberrypi.gpg.key deleted file mode 100644 index 60b5f65..0000000 --- a/stage0/00-configure-apt/files/raspberrypi.gpg.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBE/d7o8BCACrwqQacGJfn3tnMzGui6mv2lLxYbsOuy/+U4rqMmGEuo3h9m92 -30E2EtypsoWczkBretzLUCFv+VUOxaA6sV9+puTqYGhhQZFuKUWcG7orf7QbZRuu -TxsEUepW5lg7MExmAu1JJzqM0kMQX8fVyWVDkjchZ/is4q3BPOUCJbUJOsE+kK/6 -8kW6nWdhwSAjfDh06bA5wvoXNjYoDdnSZyVdcYCPEJXEg5jfF/+nmiFKMZBraHwn -eQsepr7rBXxNcEvDlSOPal11fg90KXpy7Umre1UcAZYJdQeWcHu7X5uoJx/MG5J8 -ic6CwYmDaShIFa92f8qmFcna05+lppk76fsnABEBAAG0IFJhc3BiZXJyeSBQaSBB -cmNoaXZlIFNpZ25pbmcgS2V5iQE4BBMBAgAiBQJP3e6PAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRCCsSmSf6MwPk6vB/9pePB3IukU9WC9Bammh3mpQTvL -OifbkzHkmAYxzjfK6D2I8pT0xMxy949+ThzJ7uL60p6T/32ED9DR3LHIMXZvKtuc -mQnSiNDX03E2p7lIP/htoxW2hDP2n8cdlNdt0M9IjaWBppsbO7IrDppG2B1aRLni -uD7v8bHRL2mKTtIDLX42Enl8aLAkJYgNWpZyPkDyOqamjijarIWjGEPCkaURF7g4 -d44HvYhpbLMOrz1m6N5Bzoa5+nq3lmifeiWKxioFXU+Hy5bhtAM6ljVb59hbD2ra -X4+3LXC9oox2flmQnyqwoyfZqVgSQa0B41qEQo8t1bz6Q1Ti7fbMLThmbRHiuQEN -BE/d7o8BCADNlVtBZU63fm79SjHh5AEKFs0C3kwa0mOhp9oas/haDggmhiXdzeD3 -49JWz9ZTx+vlTq0s+I+nIR1a+q+GL+hxYt4HhxoA6vlDMegVfvZKzqTX9Nr2VqQa -S4Kz3W5ULv81tw3WowK6i0L7pqDmvDqgm73mMbbxfHD0SyTt8+fk7qX6Ag2pZ4a9 -ZdJGxvASkh0McGpbYJhk1WYD+eh4fqH3IaeJi6xtNoRdc5YXuzILnp+KaJyPE5CR -qUY5JibOD3qR7zDjP0ueP93jLqmoKltCdN5+yYEExtSwz5lXniiYOJp8LWFCgv5h -m8aYXkcJS1xVV9Ltno23YvX5edw9QY4hABEBAAGJAR8EGAECAAkFAk/d7o8CGwwA -CgkQgrEpkn+jMD5Figf/dIC1qtDMTbu5IsI5uZPX63xydaExQNYf98cq5H2fWF6O -yVR7ERzA2w33hI0yZQrqO6pU9SRnHRxCFvGv6y+mXXXMRcmjZG7GiD6tQWeN/3wb -EbAn5cg6CJ/Lk/BI4iRRfBX07LbYULCohlGkwBOkRo10T+Ld4vCCnBftCh5x2OtZ -TOWRULxP36y2PLGVNF+q9pho98qx+RIxvpofQM/842ZycjPJvzgVQsW4LT91KYAE -4TVf6JjwUM6HZDoiNcX6d7zOhNfQihXTsniZZ6rky287htsWVDNkqOi5T3oTxWUo -m++/7s3K3L0zWopdhMVcgg6Nt9gcjzqN1c0gy55L/g== -=mNSj ------END PGP PUBLIC KEY BLOCK----- diff --git a/stage0/00-configure-apt/files/raspbian.sources b/stage0/00-configure-apt/files/raspbian.sources new file mode 100644 index 0000000..0f2e26f --- /dev/null +++ b/stage0/00-configure-apt/files/raspbian.sources @@ -0,0 +1,6 @@ +Types: deb +URIs: http://raspbian.raspberrypi.com/raspbian/ +Arch: armhf +Suites: RELEASE +Components: main contrib non-free rpi +Signed-By: /usr/share/keyrings/raspbian-archive-keyring.gpg diff --git a/stage0/00-configure-apt/files/raspi.list b/stage0/00-configure-apt/files/raspi.list deleted file mode 100644 index 5f889b1..0000000 --- a/stage0/00-configure-apt/files/raspi.list +++ /dev/null @@ -1,3 +0,0 @@ -deb http://archive.raspberrypi.com/debian/ RELEASE main -# Uncomment line below then 'apt-get update' to enable 'apt-get source' -#deb-src http://archive.raspberrypi.com/debian/ RELEASE main diff --git a/stage0/00-configure-apt/files/raspi.sources b/stage0/00-configure-apt/files/raspi.sources new file mode 100644 index 0000000..1ec8b97 --- /dev/null +++ b/stage0/00-configure-apt/files/raspi.sources @@ -0,0 +1,5 @@ +Types: deb +URIs: http://archive.raspberrypi.com/debian/ +Suites: RELEASE +Components: main +Signed-By: /usr/share/keyrings/raspberrypi-archive-keyring.pgp diff --git a/stage0/00-configure-apt/files/sources.list b/stage0/00-configure-apt/files/sources.list deleted file mode 100644 index 3ef0699..0000000 --- a/stage0/00-configure-apt/files/sources.list +++ /dev/null @@ -1,3 +0,0 @@ -deb [ arch=armhf ] http://raspbian.raspberrypi.com/raspbian/ RELEASE main contrib non-free rpi -# Uncomment line below then 'apt-get update' to enable 'apt-get source' -#deb-src http://raspbian.raspberrypi.com/raspbian/ RELEASE main contrib non-free rpi From 5dc3f5df482f299b4f6b86a5270ca511c1c17461 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 15 Jul 2025 13:38:31 +0100 Subject: [PATCH 05/27] Remove v7l kernel --- stage0/02-firmware/01-packages | 2 -- 1 file changed, 2 deletions(-) diff --git a/stage0/02-firmware/01-packages b/stage0/02-firmware/01-packages index 38f2f52..8132aa2 100644 --- a/stage0/02-firmware/01-packages +++ b/stage0/02-firmware/01-packages @@ -2,8 +2,6 @@ initramfs-tools raspi-firmware linux-image-rpi-v6 linux-image-rpi-v7 -linux-image-rpi-v7l linux-image-rpi-v8 linux-headers-rpi-v6 linux-headers-rpi-v7 -linux-headers-rpi-v7l From a62422ce71383f69b12679d7caf82459beb525de Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 14:01:46 +0100 Subject: [PATCH 06/27] stage4: change do_wayland to W2 (labwc) --- stage4/06-enable-wayland/00-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage4/06-enable-wayland/00-run.sh b/stage4/06-enable-wayland/00-run.sh index d1f240d..bd8bbc3 100755 --- a/stage4/06-enable-wayland/00-run.sh +++ b/stage4/06-enable-wayland/00-run.sh @@ -1,5 +1,5 @@ #!/bin/bash -e on_chroot << EOF - SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wayland W3 + SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wayland W2 EOF From c4e9044fafc7fd7dbb12b227c2052c71f7aab4db Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Jun 2025 22:09:14 +0100 Subject: [PATCH 07/27] Set machine-id to "uninitialized" to signal first boot --- export-image/05-finalise/01-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export-image/05-finalise/01-run.sh b/export-image/05-finalise/01-run.sh index 860b97f..79a01e2 100755 --- a/export-image/05-finalise/01-run.sh +++ b/export-image/05-finalise/01-run.sh @@ -51,7 +51,7 @@ rm -f "${ROOTFS_DIR}"/usr/share/icons/*/icon-theme.cache rm -f "${ROOTFS_DIR}/var/lib/dbus/machine-id" -true > "${ROOTFS_DIR}/etc/machine-id" +echo "uninitialized" > "${ROOTFS_DIR}/etc/machine-id" ln -nsf /proc/mounts "${ROOTFS_DIR}/etc/mtab" From 23e7af35a13f07e246145b94ce0884eb75d654c9 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 2 Jun 2025 22:08:32 +0100 Subject: [PATCH 08/27] Remove firstboot init script in favour of initramfs and systemd services --- stage2/01-sys-tweaks/00-patches/07-resize-init.diff | 5 ----- stage2/01-sys-tweaks/00-patches/series | 1 - 2 files changed, 6 deletions(-) delete mode 100644 stage2/01-sys-tweaks/00-patches/07-resize-init.diff diff --git a/stage2/01-sys-tweaks/00-patches/07-resize-init.diff b/stage2/01-sys-tweaks/00-patches/07-resize-init.diff deleted file mode 100644 index e508a9f..0000000 --- a/stage2/01-sys-tweaks/00-patches/07-resize-init.diff +++ /dev/null @@ -1,5 +0,0 @@ ---- stage2.orig/rootfs/boot/firmware/cmdline.txt -+++ stage2/rootfs/boot/firmware/cmdline.txt -@@ -1 +1 @@ --console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait -+console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet init=/usr/lib/raspberrypi-sys-mods/firstboot diff --git a/stage2/01-sys-tweaks/00-patches/series b/stage2/01-sys-tweaks/00-patches/series index aee0402..19b04f5 100644 --- a/stage2/01-sys-tweaks/00-patches/series +++ b/stage2/01-sys-tweaks/00-patches/series @@ -2,4 +2,3 @@ 02-swap.diff 04-inputrc.diff 05-path.diff -07-resize-init.diff From 6811c1dc41b0eb71eefb9cf2beebbd18b9d1d06e Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Fri, 6 Jun 2025 14:53:26 +0100 Subject: [PATCH 09/27] Remove fake-hwclock --- export-image/05-finalise/01-run.sh | 5 ++--- stage2/01-sys-tweaks/00-packages | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/export-image/05-finalise/01-run.sh b/export-image/05-finalise/01-run.sh index 79a01e2..251b4df 100755 --- a/export-image/05-finalise/01-run.sh +++ b/export-image/05-finalise/01-run.sh @@ -7,12 +7,11 @@ BMAP_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.bmap" on_chroot << EOF update-initramfs -k all -c -if [ -x /etc/init.d/fake-hwclock ]; then - /etc/init.d/fake-hwclock stop -fi if hash hardlink 2>/dev/null; then hardlink -t /usr/share/doc fi +install -m 755 -o systemd-timesync -g systemd-timesync -d /var/lib/systemd/timesync/clock +install -m 644 -o systemd-timesync -g systemd-timesync /dev/null /var/lib/systemd/timesync/clock EOF if [ -f "${ROOTFS_DIR}/etc/initramfs-tools/update-initramfs.conf" ]; then diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index d5d2856..b8c40a0 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -12,7 +12,7 @@ avahi-daemon lua5.1 luajit ca-certificates curl -fake-hwclock nfs-common usbutils +nfs-common usbutils dosfstools dphys-swapfile raspberrypi-sys-mods From f6a540d36cb6e32f70595ef9d3f8da557b6dea0e Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 5 Jun 2025 19:47:42 +0100 Subject: [PATCH 10/27] Simplify console-setup configuration --- stage2/01-sys-tweaks/00-debconf | 6 ------ stage2/01-sys-tweaks/01-run.sh | 5 ++--- stage2/01-sys-tweaks/files/console-setup | 16 ---------------- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 stage2/01-sys-tweaks/files/console-setup diff --git a/stage2/01-sys-tweaks/00-debconf b/stage2/01-sys-tweaks/00-debconf index 884db93..5e3340b 100644 --- a/stage2/01-sys-tweaks/00-debconf +++ b/stage2/01-sys-tweaks/00-debconf @@ -1,12 +1,6 @@ -# Encoding to use on the console: -# Choices: ARMSCII-8, CP1251, CP1255, CP1256, GEORGIAN-ACADEMY, GEORGIAN-PS, IBM1133, ISIRI-3342, ISO-8859-1, ISO-8859-10, ISO-8859-11, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16, ISO-8859-2, ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6, ISO-8859-7, ISO-8859-8, ISO-8859-9, KOI8-R, KOI8-U, TIS-620, UTF-8, VISCII -console-setup console-setup/charmap47 select UTF-8 # Character set to support: # Choices: . Arabic, # Armenian, # Cyrillic - KOI8-R and KOI8-U, # Cyrillic - non-Slavic languages, # Cyrillic - Slavic languages (also Bosnian and Serbian Latin), . Ethiopic, # Georgian, # Greek, # Hebrew, # Lao, # Latin1 and Latin5 - western Europe and Turkic languages, # Latin2 - central Europe and Romanian, # Latin3 and Latin8 - Chichewa; Esperanto; Irish; Maltese and Welsh, # Latin7 - Lithuanian; Latvian; Maori and Marshallese, . Latin - Vietnamese, # Thai, . Combined - Latin; Slavic Cyrillic; Hebrew; basic Arabic, . Combined - Latin; Slavic Cyrillic; Greek, . Combined - Latin; Slavic and non-Slavic Cyrillic, Guess optimal character set console-setup console-setup/codeset47 select Guess optimal character set -# Font for the console: -# Choices: Fixed, Goha, GohaClassic, Terminus, TerminusBold, TerminusBoldVGA, VGA, Do not change the boot/kernel font, Let the system select a suitable font -console-setup console-setup/fontface47 select Do not change the boot/kernel font # Key to function as AltGr: # Choices: The default for the keyboard layout, No AltGr key, Right Alt (AltGr), Right Control, Right Logo key, Menu key, Left Alt, Left Logo key, Keypad Enter key, Both Logo keys, Both Alt keys keyboard-configuration keyboard-configuration/altgr select The default for the keyboard layout diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index aca8074..9488996 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -4,8 +4,6 @@ install -m 755 files/resize2fs_once "${ROOTFS_DIR}/etc/init.d/" install -m 644 files/50raspi "${ROOTFS_DIR}/etc/apt/apt.conf.d/" -install -m 644 files/console-setup "${ROOTFS_DIR}/etc/default/" - if [ -n "${PUBKEY_SSH_FIRST_USER}" ]; then install -v -m 0700 -o 1000 -g 1000 -d "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh echo "${PUBKEY_SSH_FIRST_USER}" >"${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys @@ -66,9 +64,10 @@ EOF rm -f "${ROOTFS_DIR}/etc/ssh/"ssh_host_*_key* +sed -i 's/^FONTFACE=.*/FONTFACE=""/;s/^FONTSIZE=.*/FONTSIZE=""/' "${ROOTFS_DIR}/etc/default/console-setup" sed -i "s/PLACEHOLDER//" "${ROOTFS_DIR}/etc/default/keyboard" on_chroot << EOF -DEBIAN_FRONTEND=noninteractive dpkg-reconfigure keyboard-configuration +DEBIAN_FRONTEND=noninteractive dpkg-reconfigure keyboard-configuration console-setup EOF sed -i 's/^#\?Storage=.*/Storage=volatile/' "${ROOTFS_DIR}/etc/systemd/journald.conf" diff --git a/stage2/01-sys-tweaks/files/console-setup b/stage2/01-sys-tweaks/files/console-setup deleted file mode 100644 index 6508cdc..0000000 --- a/stage2/01-sys-tweaks/files/console-setup +++ /dev/null @@ -1,16 +0,0 @@ -# CONFIGURATION FILE FOR SETUPCON - -# Consult the console-setup(5) manual page. - -ACTIVE_CONSOLES="/dev/tty[1-6]" - -CHARMAP="UTF-8" - -CODESET="guess" -FONTFACE="" -FONTSIZE="" - -VIDEOMODE= - -# The following is an example how to use a braille font -# FONT='lat9w-08.psf.gz brl-8x8.psf' From a078afeba001f93cc1c74a266bdd07d3f03ec713 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 5 Jun 2025 19:49:21 +0100 Subject: [PATCH 11/27] stage2: remove resize2fs_once init.d service --- stage2/01-sys-tweaks/01-run.sh | 9 -------- stage2/01-sys-tweaks/files/resize2fs_once | 25 ----------------------- 2 files changed, 34 deletions(-) delete mode 100644 stage2/01-sys-tweaks/files/resize2fs_once diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 9488996..cde04e8 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -1,7 +1,5 @@ #!/bin/bash -e -install -m 755 files/resize2fs_once "${ROOTFS_DIR}/etc/init.d/" - install -m 644 files/50raspi "${ROOTFS_DIR}/etc/apt/apt.conf.d/" if [ -n "${PUBKEY_SSH_FIRST_USER}" ]; then @@ -31,14 +29,7 @@ EOF if [ "${USE_QEMU}" = "1" ]; then echo "enter QEMU mode" install -m 644 files/90-qemu.rules "${ROOTFS_DIR}/etc/udev/rules.d/" - on_chroot << EOF -systemctl disable resize2fs_once -EOF echo "leaving QEMU mode" -else - on_chroot << EOF -systemctl enable resize2fs_once -EOF fi on_chroot <&2 - exit 3 - ;; -esac From 9ea6e44d64a393563eeb4f51c0de864e5335b7c1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Thu, 5 Jun 2025 19:48:35 +0100 Subject: [PATCH 12/27] stage2: enable pdiffs --- stage2/01-sys-tweaks/01-run.sh | 2 -- stage2/01-sys-tweaks/files/50raspi | 5 ----- 2 files changed, 7 deletions(-) delete mode 100644 stage2/01-sys-tweaks/files/50raspi diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index cde04e8..d977b3d 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -1,7 +1,5 @@ #!/bin/bash -e -install -m 644 files/50raspi "${ROOTFS_DIR}/etc/apt/apt.conf.d/" - if [ -n "${PUBKEY_SSH_FIRST_USER}" ]; then install -v -m 0700 -o 1000 -g 1000 -d "${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh echo "${PUBKEY_SSH_FIRST_USER}" >"${ROOTFS_DIR}"/home/"${FIRST_USER_NAME}"/.ssh/authorized_keys diff --git a/stage2/01-sys-tweaks/files/50raspi b/stage2/01-sys-tweaks/files/50raspi deleted file mode 100644 index da3bd48..0000000 --- a/stage2/01-sys-tweaks/files/50raspi +++ /dev/null @@ -1,5 +0,0 @@ -# never use pdiffs. Current implementation is very slow on low-powered devices -Acquire::PDiffs "0"; - -# download up to 5 pdiffs: -#Acquire::PDiffs::FileLimit "5"; From 22601c0e4afb6d05812fb82d8cdec5e82404e3f3 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 12:58:04 +0100 Subject: [PATCH 13/27] stage2: replace dphys-swapfile with rpi-swap --- stage2/01-sys-tweaks/00-packages | 2 +- stage2/01-sys-tweaks/00-patches/02-swap.diff | 13 ------------- stage2/01-sys-tweaks/00-patches/series | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 stage2/01-sys-tweaks/00-patches/02-swap.diff diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index b8c40a0..8000fb8 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -14,7 +14,7 @@ luajit ca-certificates curl nfs-common usbutils dosfstools -dphys-swapfile +rpi-swap rpi-loop-utils raspberrypi-sys-mods pi-bluetooth apt-listchanges diff --git a/stage2/01-sys-tweaks/00-patches/02-swap.diff b/stage2/01-sys-tweaks/00-patches/02-swap.diff deleted file mode 100644 index 52cdda4..0000000 --- a/stage2/01-sys-tweaks/00-patches/02-swap.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: jessie-stage2/rootfs/etc/dphys-swapfile -=================================================================== ---- jessie-stage2.orig/rootfs/etc/dphys-swapfile -+++ jessie-stage2/rootfs/etc/dphys-swapfile -@@ -13,7 +13,7 @@ - - # set size to absolute value, leaving empty (default) then uses computed value - # you most likely don't want this, unless you have an special disk situation --#CONF_SWAPSIZE= -+CONF_SWAPSIZE=512 - - # set size to computed value, this times RAM size, dynamically adapts, - # guarantees that there is enough swap without wasting disk space on excess diff --git a/stage2/01-sys-tweaks/00-patches/series b/stage2/01-sys-tweaks/00-patches/series index 19b04f5..cbd0fd4 100644 --- a/stage2/01-sys-tweaks/00-patches/series +++ b/stage2/01-sys-tweaks/00-patches/series @@ -1,4 +1,3 @@ 01-useradd.diff -02-swap.diff 04-inputrc.diff 05-path.diff From 131a3757adddc2d0f8a013b288222fe26542186f Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:22:44 +0100 Subject: [PATCH 14/27] stage2: remove nfs-common --- stage2/01-sys-tweaks/00-packages | 2 +- stage2/01-sys-tweaks/01-run.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index 8000fb8..a5d3e06 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -12,7 +12,7 @@ avahi-daemon lua5.1 luajit ca-certificates curl -nfs-common usbutils +usbutils dosfstools rpi-swap rpi-loop-utils raspberrypi-sys-mods diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index d977b3d..8b8af25 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -14,7 +14,6 @@ fi on_chroot << EOF systemctl disable hwclock.sh -systemctl disable nfs-common systemctl disable rpcbind if [ "${ENABLE_SSH}" == "1" ]; then systemctl enable ssh From e324499cf89b59e8ca8781a76e6785e3cec11222 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:29:49 +0100 Subject: [PATCH 15/27] stage2: disabling these services doesn't do anything on Trixie --- stage2/01-sys-tweaks/01-run.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 8b8af25..ebb5d23 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -13,8 +13,6 @@ s/^#?[[:blank:]]*PasswordAuthentication[[:blank:]]*yes[[:blank:]]*$/PasswordAuth fi on_chroot << EOF -systemctl disable hwclock.sh -systemctl disable rpcbind if [ "${ENABLE_SSH}" == "1" ]; then systemctl enable ssh else From e2893c11ab3dfc7777ddd03f93b37762f568c160 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:06:21 +0100 Subject: [PATCH 16/27] stage2: don't enable regenerate_ssh_host_keys. SSH generates the keys itself now. --- stage2/01-sys-tweaks/01-run.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index ebb5d23..ce6aac9 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -18,7 +18,6 @@ if [ "${ENABLE_SSH}" == "1" ]; then else systemctl disable ssh fi -systemctl enable regenerate_ssh_host_keys EOF if [ "${USE_QEMU}" = "1" ]; then From 59b16f3bb46160e73f029edf6ae8df3b0a4e0c67 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:07:16 +0100 Subject: [PATCH 17/27] stage2: Don't modify journald.conf. This is done via a drop-in config file in sys-mods. --- stage2/01-sys-tweaks/01-run.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index ce6aac9..93bc36d 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -55,8 +55,6 @@ on_chroot << EOF DEBIAN_FRONTEND=noninteractive dpkg-reconfigure keyboard-configuration console-setup EOF -sed -i 's/^#\?Storage=.*/Storage=volatile/' "${ROOTFS_DIR}/etc/systemd/journald.conf" - if [ -e "${ROOTFS_DIR}/etc/avahi/avahi-daemon.conf" ]; then sed -i 's/^#\?publish-workstation=.*/publish-workstation=yes/' "${ROOTFS_DIR}/etc/avahi/avahi-daemon.conf" fi From 99068c00046159d1c8b7d8cb63407e01051a0a53 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:18:56 +0100 Subject: [PATCH 18/27] Replace raspberrypi-ui-mods with new meta-packages --- stage4/00-install-packages/00-packages | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 812fe81..3ae1bc5 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -3,7 +3,10 @@ python3-tk thonny python3-pgzero python3-serial debian-reference-en dillo -raspberrypi-net-mods raspberrypi-ui-mods +raspberrypi-net-mods +rpd-wayland-core rpd-x-core +rpd-theme +rpd-utilities rpd-preferences python3-pip python3-numpy rc-gui sense-hat From 5a978bf9d2f01e2a1dca63ca9459a44fad132f13 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:19:45 +0100 Subject: [PATCH 19/27] stage4: remove raspberrypi-net-mods, since it's already installed in stage2 --- stage4/00-install-packages/00-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 3ae1bc5..9ab32cd 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -3,7 +3,6 @@ python3-tk thonny python3-pgzero python3-serial debian-reference-en dillo -raspberrypi-net-mods rpd-wayland-core rpd-x-core rpd-theme rpd-utilities rpd-preferences From 6baaa073c7a9f234fb5e3569ca7a60017bb1bcaa Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 13:20:06 +0100 Subject: [PATCH 20/27] stage4: remove dillo --- stage4/00-install-packages/00-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 9ab32cd..285bccd 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -2,7 +2,7 @@ python3-pygame python3-tk thonny python3-pgzero python3-serial -debian-reference-en dillo +debian-reference-en rpd-wayland-core rpd-x-core rpd-theme rpd-utilities rpd-preferences From c4adcfca4ff629ef08a228428f08faaeb2fa76fa Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 28 Jul 2025 09:42:45 +0100 Subject: [PATCH 21/27] Remove rpi-imager (armhf builds no longer provided) --- stage4/00-install-packages/00-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 285bccd..6531427 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -20,7 +20,6 @@ rp-prefapps ffmpeg vlc rpi-connect -rpi-imager labwc squeekboard From ccb473a3bac47b24cbd9e3e52a500ceefd5615d1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 3 Jun 2025 15:07:01 +0100 Subject: [PATCH 22/27] stage2: replace pi-bluetooth with bluez and bluez-firmware --- stage2/01-sys-tweaks/00-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage2/01-sys-tweaks/00-packages b/stage2/01-sys-tweaks/00-packages index a5d3e06..a1c419e 100644 --- a/stage2/01-sys-tweaks/00-packages +++ b/stage2/01-sys-tweaks/00-packages @@ -16,7 +16,6 @@ usbutils dosfstools rpi-swap rpi-loop-utils raspberrypi-sys-mods -pi-bluetooth apt-listchanges usb-modeswitch libpam-chksshpwd @@ -36,3 +35,4 @@ unzip zip p7zip-full file kms++-utils python3-venv +bluez bluez-firmware From 04bc6843a9d144e6813780afa5792d7ba6816043 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 10 Jun 2025 14:14:21 +0100 Subject: [PATCH 23/27] stage1: add resize to cmdline.txt --- stage1/00-boot-files/files/cmdline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1/00-boot-files/files/cmdline.txt b/stage1/00-boot-files/files/cmdline.txt index 03cde68..71b90ff 100644 --- a/stage1/00-boot-files/files/cmdline.txt +++ b/stage1/00-boot-files/files/cmdline.txt @@ -1 +1 @@ -console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait +console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait resize From 3b4c7e2ab81db5a8799896c07519353c1a7b3b9c Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 14:06:23 +0100 Subject: [PATCH 24/27] stage5: Remove (nu)scratch, since Trixie does not ship SqueakVM --- stage5/00-install-extras/00-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index c871e09..406a548 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -1,5 +1,5 @@ mu-editor -scratch nuscratch scratch3 +scratch3 wolfram-engine claws-mail realvnc-vnc-viewer From 881aa4112936e1a2a29c2c16f85c78491e79e2e3 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 14:06:54 +0100 Subject: [PATCH 25/27] stage5: Remove realvnc packages, since they weren't provided for Trixie --- stage4/00-install-packages/00-packages-nr | 1 - stage5/00-install-extras/00-packages | 1 - 2 files changed, 2 deletions(-) diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr index b904b80..88c1cd4 100644 --- a/stage4/00-install-packages/00-packages-nr +++ b/stage4/00-install-packages/00-packages-nr @@ -1,2 +1 @@ pi-package -realvnc-vnc-server diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index 406a548..39c947b 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -2,6 +2,5 @@ mu-editor scratch3 wolfram-engine claws-mail -realvnc-vnc-viewer code-the-classics code-the-classics-2 kicad From 556087cd0604dc289efce6de2a4665c75351f5aa Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 14:07:29 +0100 Subject: [PATCH 26/27] stage5: Remove wolfram-engine, since it wasn't provided for Trixie --- stage5/00-install-extras/00-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index 39c947b..dd5fbe4 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -1,6 +1,5 @@ mu-editor scratch3 -wolfram-engine claws-mail code-the-classics code-the-classics-2 kicad From d4cd8f9a57bc6afda5077a3f4b1778f81edd5e02 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Tue, 19 Aug 2025 14:07:49 +0100 Subject: [PATCH 27/27] stage5: Remove scratch3, since it wasn't provided for Trixie --- stage5/00-install-extras/00-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/stage5/00-install-extras/00-packages b/stage5/00-install-extras/00-packages index dd5fbe4..4ecebb7 100644 --- a/stage5/00-install-extras/00-packages +++ b/stage5/00-install-extras/00-packages @@ -1,5 +1,4 @@ mu-editor -scratch3 claws-mail code-the-classics code-the-classics-2 kicad