From 3bcd9d452a56f43bfc62e88bf797d81ea46b524a Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 4 Aug 2025 10:03:20 +0100 Subject: [PATCH 1/3] Switch stage3 to use meta-packages --- stage3/00-install-packages/00-packages | 19 ------------------- stage3/00-install-packages/00-packages-nr | 10 ++-------- stage3/00-install-packages/01-run.sh | 5 ----- 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 stage3/00-install-packages/00-packages delete mode 100755 stage3/00-install-packages/01-run.sh diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages deleted file mode 100644 index e3e2e0c..0000000 --- a/stage3/00-install-packages/00-packages +++ /dev/null @@ -1,19 +0,0 @@ -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 -gvfs -rfkill -chromium rpi-chromium-mods libwidevinecdm0 -firefox rpi-firefox-mods -gldriver-test -fonts-droid-fallback -fonts-liberation2 -obconf -raindrop -libcamera-tools -rpicam-apps -python3-picamera2 -python3-pyqt5 -python3-opengl -vulkan-tools mesa-vulkan-drivers diff --git a/stage3/00-install-packages/00-packages-nr b/stage3/00-install-packages/00-packages-nr index bd310cf..fec8391 100644 --- a/stage3/00-install-packages/00-packages-nr +++ b/stage3/00-install-packages/00-packages-nr @@ -1,8 +1,2 @@ -xserver-xorg-video-fbdev xserver-xorg xinit -mousepad -eom -lxde lxtask menu-xdg -zenity xdg-utils -gvfs-backends gvfs-fuse -lightdm gnome-themes-extra-data gnome-icon-theme -gnome-keyring +rpd-wayland-core +rpd-x-core diff --git a/stage3/00-install-packages/01-run.sh b/stage3/00-install-packages/01-run.sh deleted file mode 100755 index 7fb0f4b..0000000 --- a/stage3/00-install-packages/01-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot <<- EOF - apt-mark auto python3-pyqt5 python3-opengl -EOF From 349a6a0ae0de94e0b82467353c22e00d876eedac Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 4 Aug 2025 10:06:13 +0100 Subject: [PATCH 2/3] Switch stage4 to use meta-packages --- stage4/00-install-packages/00-debconf | 2 -- stage4/00-install-packages/00-packages | 33 ++++--------------- stage4/00-install-packages/00-packages-nr | 1 - stage4/00-install-packages/02-packages | 4 --- stage4/01-console-autologin/00-run.sh | 5 --- .../01-run.sh => 01-print-support/00-run.sh} | 0 stage4/04-enable-xcompmgr/00-run.sh | 5 --- stage4/05-print-support/00-packages | 1 - stage4/06-enable-wayland/00-run.sh | 5 --- 9 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 stage4/00-install-packages/00-debconf delete mode 100644 stage4/00-install-packages/00-packages-nr delete mode 100644 stage4/00-install-packages/02-packages delete mode 100755 stage4/01-console-autologin/00-run.sh rename stage4/{05-print-support/01-run.sh => 01-print-support/00-run.sh} (100%) delete mode 100755 stage4/04-enable-xcompmgr/00-run.sh delete mode 100644 stage4/05-print-support/00-packages delete mode 100755 stage4/06-enable-wayland/00-run.sh diff --git a/stage4/00-install-packages/00-debconf b/stage4/00-install-packages/00-debconf deleted file mode 100644 index 87932e2..0000000 --- a/stage4/00-install-packages/00-debconf +++ /dev/null @@ -1,2 +0,0 @@ -# Enable realtime process priority? -jackd2 jackd/tweak_rt_limits boolean true diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 6531427..5dde25f 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -1,27 +1,8 @@ -python3-pygame -python3-tk thonny -python3-pgzero -python3-serial -debian-reference-en -rpd-wayland-core rpd-x-core +rpd-applications +rpd-developer +rpd-graphics +rpd-preferences rpd-theme -rpd-utilities rpd-preferences -python3-pip -python3-numpy -rc-gui sense-hat -tree -libgl1-mesa-dri libgles1 xcompmgr -geany -piclone -python3-flask -pprompt -piwiz -rp-prefapps -ffmpeg -vlc -rpi-connect -labwc -squeekboard - -# ninja-build and openocd needed for vscode pico extension -meson openocd +rpd-utilities +rpd-wayland-extras +rpd-x-extras diff --git a/stage4/00-install-packages/00-packages-nr b/stage4/00-install-packages/00-packages-nr deleted file mode 100644 index 88c1cd4..0000000 --- a/stage4/00-install-packages/00-packages-nr +++ /dev/null @@ -1 +0,0 @@ -pi-package diff --git a/stage4/00-install-packages/02-packages b/stage4/00-install-packages/02-packages deleted file mode 100644 index fc43d17..0000000 --- a/stage4/00-install-packages/02-packages +++ /dev/null @@ -1,4 +0,0 @@ -hunspell-en-gb -hyphen-en-gb -wamerican -wbritish diff --git a/stage4/01-console-autologin/00-run.sh b/stage4/01-console-autologin/00-run.sh deleted file mode 100755 index 665dcdb..0000000 --- a/stage4/01-console-autologin/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_boot_behaviour B4 -EOF diff --git a/stage4/05-print-support/01-run.sh b/stage4/01-print-support/00-run.sh similarity index 100% rename from stage4/05-print-support/01-run.sh rename to stage4/01-print-support/00-run.sh diff --git a/stage4/04-enable-xcompmgr/00-run.sh b/stage4/04-enable-xcompmgr/00-run.sh deleted file mode 100755 index ad6298d..0000000 --- a/stage4/04-enable-xcompmgr/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - raspi-config nonint do_xcompmgr 0 -EOF diff --git a/stage4/05-print-support/00-packages b/stage4/05-print-support/00-packages deleted file mode 100644 index 462d36c..0000000 --- a/stage4/05-print-support/00-packages +++ /dev/null @@ -1 +0,0 @@ -cups diff --git a/stage4/06-enable-wayland/00-run.sh b/stage4/06-enable-wayland/00-run.sh deleted file mode 100755 index bd8bbc3..0000000 --- a/stage4/06-enable-wayland/00-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -on_chroot << EOF - SUDO_USER="${FIRST_USER_NAME}" raspi-config nonint do_wayland W2 -EOF From bd0a6abb8d43f6c7ef7db5bc63cbc2d5ee5e55e1 Mon Sep 17 00:00:00 2001 From: Serge Schneider Date: Mon, 4 Aug 2025 21:00:32 +0100 Subject: [PATCH 3/3] Move print support, rpd-theme and rpd-preferences to stage3 --- stage3/00-install-packages/00-packages | 2 ++ {stage4 => stage3}/01-print-support/00-run.sh | 0 stage4/00-install-packages/00-packages | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 stage3/00-install-packages/00-packages rename {stage4 => stage3}/01-print-support/00-run.sh (100%) diff --git a/stage3/00-install-packages/00-packages b/stage3/00-install-packages/00-packages new file mode 100644 index 0000000..3aa1ae8 --- /dev/null +++ b/stage3/00-install-packages/00-packages @@ -0,0 +1,2 @@ +rpd-preferences +rpd-theme diff --git a/stage4/01-print-support/00-run.sh b/stage3/01-print-support/00-run.sh similarity index 100% rename from stage4/01-print-support/00-run.sh rename to stage3/01-print-support/00-run.sh diff --git a/stage4/00-install-packages/00-packages b/stage4/00-install-packages/00-packages index 5dde25f..85311f8 100644 --- a/stage4/00-install-packages/00-packages +++ b/stage4/00-install-packages/00-packages @@ -1,8 +1,6 @@ rpd-applications rpd-developer rpd-graphics -rpd-preferences -rpd-theme rpd-utilities rpd-wayland-extras rpd-x-extras