Merge branch 'master' into arm64

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

build-docker.sh

@@ -82,7 +82,7 @@ fi
 # Modify original build-options to allow config file to be mounted in the docker container
 BUILD_OPTS="$(echo "${BUILD_OPTS:-}" | sed -E 's@\-c\s?([^ ]+)@-c /config@')"
 
-${DOCKER} build --build-arg BASE_IMAGE=debian:bookworm -t pi-gen "${DIR}"
+${DOCKER} build --build-arg BASE_IMAGE=debian:trixie -t pi-gen "${DIR}"
 
 if [ "${CONTAINER_EXISTS}" != "" ]; then
   DOCKER_CMDLINE_NAME="${CONTAINER_NAME}_cont"
@@ -142,7 +142,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/

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=arm64
-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}"

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
@@ -51,7 +50,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"
 

stage0/00-configure-apt/00-run.sh

@@ -1,9 +1,10 @@
 #!/bin/bash -e
 
-install -m 644 files/sources.list "${ROOTFS_DIR}/etc/apt/"
+true > "${ROOTFS_DIR}/etc/apt/sources.list"
-install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/"
+install -m 644 files/raspbian.sources "${ROOTFS_DIR}/etc/apt/sources.list.d/"
-sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list"
+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/raspi.list"
+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 files/raspberrypi-archive-keyring.pgp "${ROOTFS_DIR}/usr/share/keyrings/"
-install -m 644 "${STAGE_WORK_DIR}/raspberrypi-archive-stable.gpg" "${ROOTFS_DIR}/etc/apt/trusted.gpg.d/"
 on_chroot <<- \EOF
 	ARCH="$(dpkg --print-architecture)"
 	if [ "$ARCH" = "armhf" ]; then

stage0/00-configure-apt/files/raspberrypi.gpg.key

@@ -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-----

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

stage0/00-configure-apt/files/raspi.list

@@ -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

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

stage0/00-configure-apt/files/sources.list

@@ -1,7 +0,0 @@
-deb http://deb.debian.org/debian RELEASE main contrib non-free non-free-firmware
-deb http://deb.debian.org/debian-security/ RELEASE-security main contrib non-free non-free-firmware
-deb http://deb.debian.org/debian RELEASE-updates main contrib non-free non-free-firmware
-# Uncomment deb-src lines below then 'apt-get update' to enable 'apt-get source'
-#deb-src http://deb.debian.org/debian RELEASE main contrib non-free non-free-firmware
-#deb-src http://deb.debian.org/debian-security/ RELEASE-security main contrib non-free non-free-firmware
-#deb-src http://deb.debian.org/debian RELEASE-updates main contrib non-free non-free-firmware

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

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

stage1/01-sys-tweaks/00-patches/01-bashrc.diff

@@ -1,6 +1,6 @@
---- a/rootfs/etc/skel/.bashrc
+--- stage1.orig/rootfs/etc/skel/.bashrc
-+++ b/rootfs/etc/skel/.bashrc
++++ stage1/rootfs/etc/skel/.bashrc
-@@ -43,7 +43,7 @@
+@@ -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'
  

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

stage2/01-sys-tweaks/00-packages

@@ -5,18 +5,17 @@ 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
 lua5.1
 luajit
 ca-certificates curl
-fake-hwclock nfs-common usbutils
+usbutils
 dosfstools
-dphys-swapfile
+rpi-swap rpi-loop-utils
 raspberrypi-sys-mods
-pi-bluetooth
 apt-listchanges
 usb-modeswitch
 libpam-chksshpwd
@@ -25,7 +24,6 @@ libmtp-runtime
 rsync
 htop
 man-db
-policykit-1
 ssh-import-id
 ethtool
 ntfs-3g
@@ -37,3 +35,4 @@ unzip zip p7zip-full
 file
 kms++-utils
 python3-venv
+bluez bluez-firmware

stage2/01-sys-tweaks/00-patches/01-useradd.diff

@@ -1,9 +1,7 @@
-Index: jessie-stage2/rootfs/etc/default/useradd
+--- stage2.orig/rootfs/etc/default/useradd
-===================================================================
++++ stage2/rootfs/etc/default/useradd
---- jessie-stage2.orig/rootfs/etc/default/useradd
-+++ jessie-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

stage2/01-sys-tweaks/00-patches/02-swap.diff

@@ -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

stage2/01-sys-tweaks/00-patches/04-inputrc.diff

@@ -1,8 +1,6 @@
-Index: jessie-stage2/rootfs/etc/inputrc
+--- stage2.orig/rootfs/etc/inputrc
-===================================================================
++++ stage2/rootfs/etc/inputrc
---- jessie-stage2.orig/rootfs/etc/inputrc
+@@ -69,3 +69,7 @@ $endif
-+++ jessie-stage2/rootfs/etc/inputrc
-@@ -65,3 +65,7 @@ $endif
  # "\e[F": end-of-line
  
  $endif

stage2/01-sys-tweaks/00-patches/05-path.diff

@@ -1,8 +1,6 @@
-Index: jessie-stage2/rootfs/etc/login.defs
+--- stage2.orig/rootfs/etc/login.defs
-===================================================================
++++ stage2/rootfs/etc/login.defs
---- jessie-stage2.orig/rootfs/etc/login.defs
+@@ -60,7 +60,7 @@ HUSHLOGIN_FILE	.hushlogin
-+++ jessie-stage2/rootfs/etc/login.defs
-@@ -100,7 +100,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
+ # Terminal permissions for terminals after login(1).
-Index: jessie-stage2/rootfs/etc/profile
+--- stage2.orig/rootfs/etc/profile
-===================================================================
++++ stage2/rootfs/etc/profile
---- jessie-stage2.orig/rootfs/etc/profile
-+++ jessie-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"

stage2/01-sys-tweaks/00-patches/07-resize-init.diff

@@ -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

stage2/01-sys-tweaks/00-patches/series

@@ -1,5 +1,3 @@
 01-useradd.diff
-02-swap.diff
 04-inputrc.diff
 05-path.diff
-07-resize-init.diff

stage2/01-sys-tweaks/01-run.sh

@@ -1,11 +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/"
-
-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
@@ -19,28 +13,17 @@ s/^#?[[:blank:]]*PasswordAuthentication[[:blank:]]*yes[[:blank:]]*$/PasswordAuth
 fi
 
 on_chroot << EOF
-systemctl disable hwclock.sh
-systemctl disable nfs-common
-systemctl disable rpcbind
 if [ "${ENABLE_SSH}" == "1" ]; then
 	systemctl enable ssh
 else
 	systemctl disable ssh
 fi
-systemctl enable regenerate_ssh_host_keys
 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 <<EOF
@@ -66,13 +49,12 @@ 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"
-
 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

stage2/01-sys-tweaks/files/50raspi

@@ -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";

stage2/01-sys-tweaks/files/console-setup

@@ -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'

stage2/01-sys-tweaks/files/resize2fs_once

@@ -1,25 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          resize2fs_once
-# Required-Start:
-# Required-Stop:
-# Default-Start: 3
-# Default-Stop:
-# Short-Description: Resize the root filesystem to fill partition
-# Description:
-### END INIT INFO
-. /lib/lsb/init-functions
-case "$1" in
-  start)
-    log_daemon_msg "Starting resize2fs_once"
-    ROOT_DEV=$(findmnt / -o source -n) &&
-    resize2fs $ROOT_DEV &&
-    update-rc.d resize2fs_once remove &&
-    rm /etc/init.d/resize2fs_once &&
-    log_end_msg $?
-    ;;
-  *)
-    echo "Usage: $0 start" >&2
-    exit 3
-    ;;
-esac

stage3/00-install-packages/00-packages

@@ -2,7 +2,6 @@ gstreamer1.0-x gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-
 evince gtk2-engines alsa-utils
 desktop-base
 git
-policykit-1
 gvfs
 rfkill
 chromium rpi-chromium-mods libwidevinecdm0

stage4/00-install-packages/00-packages

@@ -2,16 +2,17 @@ python3-pygame
 python3-tk thonny
 python3-pgzero
 python3-serial
-debian-reference-en dillo
+debian-reference-en
-raspberrypi-net-mods raspberrypi-ui-mods
+rpd-wayland-core rpd-x-core
+rpd-theme
+rpd-utilities rpd-preferences
 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
@@ -19,7 +20,6 @@ rp-prefapps
 ffmpeg
 vlc
 rpi-connect
-rpi-imager
 labwc
 squeekboard
 

stage4/00-install-packages/00-packages-nr

@@ -1,2 +1 @@
 pi-package
-realvnc-vnc-server

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

stage5/00-install-extras/00-packages

@@ -1,7 +1,4 @@
 mu-editor
-scratch nuscratch scratch3
-wolfram-engine
 claws-mail
-realvnc-vnc-viewer
 code-the-classics code-the-classics-2
 kicad