Merge branch 'reducedro' into reducedro_zfs20221016-reducedro_zfs

23 files changed, 180 insertions, 18 deletions

diff --git a/build.sh b/build.sh
index 303847a..7bfce09 100755
--- a/build.sh
+++ b/build.sh
@@ -245,7 +245,7 @@ term() {
 trap term EXIT INT TERM
 
 export PI_GEN=${PI_GEN:-pi-gen}
-export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen}
+export PI_GEN_REPO=${PI_GEN_REPO:-https://jausoft.com/cgit/pi-gen.git/about/}
 
 if [ -z "${IMG_NAME}" ]; then
 	echo "IMG_NAME not set" 1>&2
@@ -311,6 +311,10 @@ export QUILT_NO_DIFF_INDEX=1
 export QUILT_NO_DIFF_TIMESTAMPS=1
 export QUILT_REFRESH_ARGS="-p ab"
 
+if [ -z "${DEB_SERVER}" ]; then
+    export DEB_SERVER="http://deb.debian.org/debian"
+fi
+
 if [ -z "${IS_TESTING}" ]; then
     IS_TESTING=
     case "${RELEASE}" in
diff --git a/scripts/01-build-debian_deb11_amd64-rw-light-jau.cfg b/scripts/01-build-debian_deb11_amd64-rw-light-jau.cfg
index 75d5963..f4e3004 100644
--- a/scripts/01-build-debian_deb11_amd64-rw-light-jau.cfg
+++ b/scripts/01-build-debian_deb11_amd64-rw-light-jau.cfg
@@ -10,6 +10,8 @@ export RELEASE=bullseye
 # export ROOTFS_RO=1
 # export REDUCED_FOOTPRINT=1
 
+# export DEB_SERVER="http://deb.debian.org/debian"
+export DEB_SERVER="http://ftp.de.debian.org/debian"
 export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="DebAmd64Light"
@@ -33,8 +35,8 @@ export KEYBOARD_KEYMAP=us
 export KEYBOARD_LAYOUT="English (US)"
 export TIMEZONE_DEFAULT="Europe/Berlin"
 
-export FIRST_USER_NAME="pi"
-export FIRST_USER_PASS="pi"
+export FIRST_USER_NAME="test01"
+export FIRST_USER_PASS="test01"
 export ENABLE_SSH=1
 export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx"
 export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]"
diff --git a/scripts/01-build-debian_deb11_amd64-rw-lightxdev-jau.cfg b/scripts/01-build-debian_deb11_amd64-rw-lightxdev-jau.cfg
index a987cae..942cf88 100644
--- a/scripts/01-build-debian_deb11_amd64-rw-lightxdev-jau.cfg
+++ b/scripts/01-build-debian_deb11_amd64-rw-lightxdev-jau.cfg
@@ -10,6 +10,8 @@ export RELEASE=bullseye
 # export ROOTFS_RO=1
 # export REDUCED_FOOTPRINT=1
 
+# export DEB_SERVER="http://deb.debian.org/debian"
+export DEB_SERVER="http://ftp.de.debian.org/debian"
 export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="DebAmd64LightDev"
@@ -33,8 +35,8 @@ export KEYBOARD_KEYMAP=us
 export KEYBOARD_LAYOUT="English (US)"
 export TIMEZONE_DEFAULT="Europe/Berlin"
 
-export FIRST_USER_NAME="pi"
-export FIRST_USER_PASS="pi"
+export FIRST_USER_NAME="test01"
+export FIRST_USER_PASS="test01"
 export ENABLE_SSH=1
 export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx"
 export PUBKEY2_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+pMJr432NOaDKnVN9+KDARU3XPDCMcwlsDdFHAEuVIGiNE2yxsC+UVKqu2+ZWKIlNET0zW8b87WsWVwiTa58lkxVre3g9DYAXpV7HPsf0bpTmzKqfPUC2z52aISluH/+Mf5FlytqFgpzx1VxREjvAw2H0GFE2K7+GsVcDFxjd5hv81FVAO9KISFnVVP9i+mSR7P4QOUYmXMw7Zq1z6hjXAGxXupEx8p/6KCqgo1tdVQBefJNOJpCABDI0yHgRsXnm7CUv1a/vM7QfCsn1hugcEGilacBLBcQp6EhXvleavX3ixffNV9RmOO0X06/EVwBtgal9aH375XABWihUi3EkRvfRqo07eieWzTIj6gO+AhZmuu4X/o53W5BG+cgMRV/+VGsLijH6jdvVv9W+motjX16TSHbSBHFaiwFyreAFi/A7WiUqdcbe12nnUsHlumhJSAIynCHKy6hgFEuGQFdENcudCgNMF7SDQEB52TwiO6BZuP6VHw4nNqxm+sbmKjgKi5vTrzIe7JkuRX+eIZLFZifFS7kfIRfQY67sCerTYsnC0Y0muX+VixKG3FIL6iSlF3KLOd41LPVNmBbpZK7oC62qrXBhvgA2d9D92o5rzqFCA6obEYiEDgyN6liASJD6VFNey366FyZzsf2U2dUeHFkyUxY0EEEFNeoOPhF5SQ== [email protected]"
diff --git a/scripts/01-build-debian_deb11_amd64-rw-lightxdev.cfg b/scripts/01-build-debian_deb11_amd64-rw-lightxdev.cfg
index 76942e9..f06bd14 100644
--- a/scripts/01-build-debian_deb11_amd64-rw-lightxdev.cfg
+++ b/scripts/01-build-debian_deb11_amd64-rw-lightxdev.cfg
@@ -10,6 +10,8 @@ export RELEASE=bullseye
 # export ROOTFS_RO=1
 # export REDUCED_FOOTPRINT=1
 
+# export DEB_SERVER="http://deb.debian.org/debian"
+export DEB_SERVER="http://ftp.de.debian.org/debian"
 # export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="DebAmd64LightDev"
@@ -33,8 +35,8 @@ export KEYBOARD_KEYMAP=us
 export KEYBOARD_LAYOUT="English (US)"
 export TIMEZONE_DEFAULT="Europe/Berlin"
 
-export FIRST_USER_NAME="pi"
-export FIRST_USER_PASS="pi"
+export FIRST_USER_NAME="test01"
+export FIRST_USER_PASS="test01"
 export ENABLE_SSH=1
 # export PUBKEY_SSH_FIRST_USER="ssh-rsa long-number my@machine"
 # export PUBKEY_ONLY_SSH=1
diff --git a/scripts/03-build-debian_deb11_amd64-ro-rescue-jau.cfg b/scripts/03-build-debian_deb11_amd64-ro-rescue-jau.cfg
index ae279e8..950c09d 100644
--- a/scripts/03-build-debian_deb11_amd64-ro-rescue-jau.cfg
+++ b/scripts/03-build-debian_deb11_amd64-ro-rescue-jau.cfg
@@ -10,6 +10,8 @@ export RELEASE=bullseye
 export ROOTFS_RO=1
 # export REDUCED_FOOTPRINT=1
 
+# export DEB_SERVER="http://deb.debian.org/debian"
+export DEB_SERVER="http://ftp.de.debian.org/debian"
 export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="DebAmd64Rescue"
@@ -33,8 +35,8 @@ export KEYBOARD_KEYMAP=us
 export KEYBOARD_LAYOUT="English (US)"
 export TIMEZONE_DEFAULT="Europe/Berlin"
 
-export FIRST_USER_NAME="pi"
-export FIRST_USER_PASS="pi"
+export FIRST_USER_NAME="test01"
+export FIRST_USER_PASS="test01"
 
 export ENABLE_SSH=1
 export PUBKEY_SSH_FIRST_USER="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAm2qfo3uiWT9V7E/sH6unVO6XhGHeNnGUswxuADwFAKyflJq2yCALWIX7+DzEhBc7O9HxVztZAHLA+lfEpctQkA7KPgX98rjLHJlrm1lQXCPjwWjTZBrGNCmjWpYkc8jew/BzngmiwDlshYqzp0rWKNvQbkGJaVctqaraJAzE3F2wa+KkSBQuw2rAhiarbiO4MtO1AIw25EnSXHhP9EpeTKhAniKm73q977m5wpzaU+uwoGPCIyVl+BeaGLbPPIF35PJbg4tIqG6WLy3a8++Mf5Ml8lETcYYfjh4er3CvqFLhAYcaCLPNOwkK/YT4UnYZoZ4nt0Z+JWjxeNhIuJf64neysBdgB5E5FEYP2iYH+EUjcYp7YCrl/3/ag4Z2KAsF2qEa6/+s90Clm0r2mqRcQyLYQ6Co1YlYa1/jq7qsiuNgWvn5Mg8Pt4+L/C0KoycvUr4HhTS8EBJx+774p2uBa3mB65Vg2llKb8DdtQwR1bh0Ot9cjKTJY0pDyPiFbemZh2q7qD958bsOZCly43WYRd6E0Df68Q2MTz6ZC1y+z103gsEiK8bXmZp42ghDa96Ik2JO6pWCEUjBJ/9+rdudRHcfDlBqoS6+wg/z+WvtRtEyvVO4LSTrsX5xHWzVloSZeAGowmLbxGWHGWfl5oCcNfUzXo0lXDP0bzyy5NxWkpE= sven@phalanx"
diff --git a/scripts/03-build-debian_deb11_amd64-ro-rescue.cfg b/scripts/03-build-debian_deb11_amd64-ro-rescue.cfg
index d5b332c..9173ffe 100644
--- a/scripts/03-build-debian_deb11_amd64-ro-rescue.cfg
+++ b/scripts/03-build-debian_deb11_amd64-ro-rescue.cfg
@@ -10,6 +10,8 @@ export RELEASE=bullseye
 export ROOTFS_RO=1
 # export REDUCED_FOOTPRINT=1
 
+# export DEB_SERVER="http://deb.debian.org/debian"
+export DEB_SERVER="http://ftp.de.debian.org/debian"
 # export APT_PROXY=http://jordan:3142
 
 export CUSTOM_NAME="DebAmd64Rescue"
@@ -33,8 +35,8 @@ export KEYBOARD_KEYMAP=us
 export KEYBOARD_LAYOUT="English (US)"
 export TIMEZONE_DEFAULT="Europe/Berlin"
 
-export FIRST_USER_NAME="pi"
-export FIRST_USER_PASS="pi"
+export FIRST_USER_NAME="test01"
+export FIRST_USER_PASS="test01"
 export ENABLE_SSH=1
 # export PUBKEY_SSH_FIRST_USER="ssh-rsa long-number my@machine"
 # export PUBKEY_ONLY_SSH=1
diff --git a/stage0/00-configure-apt/00-run.sh b/stage0/00-configure-apt/00-run.sh
index a083e88..5c71bd7 100755
--- a/stage0/00-configure-apt/00-run.sh
+++ b/stage0/00-configure-apt/00-run.sh
@@ -7,7 +7,7 @@ elif [ "${IS_TESTING}" = "1" ]; then
 else
     install -m 644 files/sources-stable.list "${ROOTFS_DIR}/etc/apt/sources.list"
 fi
-sed -i "s/RELEASE/${RELEASE}/g" "${ROOTFS_DIR}/etc/apt/sources.list"
+sed -i -e "s@RELEASE@${RELEASE}@g" -e "s@DEB_SERVER@${DEB_SERVER}@g" "${ROOTFS_DIR}/etc/apt/sources.list"
 
 if [ "${TARGET_RASPI}" = "1" ]; then
     install -m 644 files/raspi.list "${ROOTFS_DIR}/etc/apt/sources.list.d/"
diff --git a/stage0/00-configure-apt/files/sources-stable.list b/stage0/00-configure-apt/files/sources-stable.list
index cf6ab08..62bf975 100644
--- a/stage0/00-configure-apt/files/sources-stable.list
+++ b/stage0/00-configure-apt/files/sources-stable.list
@@ -1,6 +1,6 @@
-deb http://deb.debian.org/debian RELEASE main contrib non-free
+deb DEB_SERVER RELEASE main contrib non-free
 deb http://security.debian.org/debian-security/ RELEASE-security main contrib non-free
-deb http://deb.debian.org/debian RELEASE-updates main contrib non-free
+deb DEB_SERVER RELEASE-updates main contrib non-free
 # 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
 #deb-src http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free
diff --git a/stage0/00-configure-apt/files/sources-testing.list b/stage0/00-configure-apt/files/sources-testing.list
index afc8962..566ca47 100644
--- a/stage0/00-configure-apt/files/sources-testing.list
+++ b/stage0/00-configure-apt/files/sources-testing.list
@@ -1,6 +1,6 @@
-deb http://deb.debian.org/debian RELEASE main contrib non-free
+deb DEB_SERVER RELEASE main contrib non-free
 # deb http://security.debian.org/debian-security/ RELEASE-security main contrib non-free
-# deb http://deb.debian.org/debian RELEASE-updates main contrib non-free
+# deb DEB_SERVER RELEASE-updates main contrib non-free
 # 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
 #deb-src http://deb.debian.org/debian-security/ RELEASE/updates main contrib non-free
diff --git a/stage0/prerun.sh b/stage0/prerun.sh
index 16a4257..389ebe5 100755
--- a/stage0/prerun.sh
+++ b/stage0/prerun.sh
@@ -3,5 +3,5 @@
 if [ "${USE_RASPI_SOURCE}" = "1" ]; then
     bootstrap ${RELEASE} "${ROOTFS_DIR}" http://raspbian.raspberrypi.org/raspbian/
 else
-    bootstrap ${RELEASE} "${ROOTFS_DIR}" http://deb.debian.org/debian/
+    bootstrap ${RELEASE} "${ROOTFS_DIR}" ${DEB_SERVER}
 fi
diff --git a/stage1/03-install-packages/00-packages-bookworm b/stage1/03-install-packages/00-packages-bookworm
new file mode 100644
index 0000000..1a88524
--- /dev/null
+++ b/stage1/03-install-packages/00-packages-bookworm
@@ -0,0 +1 @@
+zstd
diff --git a/stage2/01-sys-tweaks/00-packages-bookworm b/stage2/01-sys-tweaks/00-packages-bookworm
new file mode 100644
index 0000000..683e70b
--- /dev/null
+++ b/stage2/01-sys-tweaks/00-packages-bookworm
@@ -0,0 +1,40 @@
+ssh less fbset sudo psmisc strace
+#ed ncdu crda
+console-setup keyboard-configuration debconf-utils parted unzip
+#build-essential manpages-dev python3 bash-completion gdb pkg-config
+libstdc++6
+python3-minimal python3-gpiozero
+#python-minimal python-gpiozero
+bash-completion pkg-config
+v4l-utils
+avahi-daemon
+lua5.1
+luajit
+hardlink ca-certificates curl
+nfs-common
+autofs
+usbutils
+libfreetype6-dev
+dosfstools
+squashfs-tools
+fatattr
+lzop
+#dphys-swapfile
+bluez
+rfkill
+apt-listchanges
+usb-modeswitch
+libmtp-runtime
+rsync
+htop iotop powertop iftop
+man-db
+policykit-1
+ssh-import-id
+rng-tools
+ethtool
+#vl805fw
+#ntfs-3g
+pciutils
+busybox
+initramfs-tools-core
+initramfs-tools
diff --git a/stage2/01-sys-tweaks/00-packages-sys-raspi-bookworm b/stage2/01-sys-tweaks/00-packages-sys-raspi-bookworm
new file mode 100644
index 0000000..e1e0b92
--- /dev/null
+++ b/stage2/01-sys-tweaks/00-packages-sys-raspi-bookworm
@@ -0,0 +1,15 @@
+#libraspberrypi-dev libraspberrypi-doc
+libraspberrypi-dev 
+raspberrypi-sys-mods
+pi-bluetooth
+raspinfo
+rpi-update
+rpi-eeprom
+libpam-chksshpwd
+python3-minimal python3-rpi.gpio python3-gpiozero
+#python-minimal python-rpi.gpio python-gpiozero
+fake-hwclock
+plymouth
+plymouth-label
+plymouth-themes
+rpd-plym-splash
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index 9ac6542..8014d56 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -246,7 +246,8 @@ on_chroot <<EOF
                 mv -f "/boot/initrd.img-\${KVERSION}" /boot/sys_${TARGET_ARCH}_000/initrd.img
             fi
             if [ -f "/boot/config-\${KVERSION}" ] ; then
-                mv -f "/boot/config-\${KVERSION}" /boot/sys_${TARGET_ARCH}_000/config
+                # keep copy in location as required by mkinitramfs (debian 12)
+                cp -a "/boot/config-\${KVERSION}" /boot/sys_${TARGET_ARCH}_000/config
             fi
             if [ -f "/boot/System.map-\${KVERSION}" ] ; then
                 mv -f "/boot/System.map-\${KVERSION}" /boot/sys_${TARGET_ARCH}_000/System.map
diff --git a/stage3b_kde/00-install-packages/00-packages-sys-raspi-bookworm b/stage3b_kde/00-install-packages/00-packages-sys-raspi-bookworm
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/stage3b_kde/00-install-packages/00-packages-sys-raspi-bookworm
diff --git a/stage3b_lxde/00-install-packages/00-packages-nr-bookworm b/stage3b_lxde/00-install-packages/00-packages-nr-bookworm
new file mode 100644
index 0000000..60c5092
--- /dev/null
+++ b/stage3b_lxde/00-install-packages/00-packages-nr-bookworm
@@ -0,0 +1,5 @@
+mousepad
+lxde lxtask menu-xdg
+zenity xdg-utils
+gvfs-backends gvfs-fuse
+lightdm gnome-icon-theme
diff --git a/stage3b_lxde/00-install-packages/00-packages-sys-raspi-bookworm b/stage3b_lxde/00-install-packages/00-packages-sys-raspi-bookworm
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/stage3b_lxde/00-install-packages/00-packages-sys-raspi-bookworm
diff --git a/stage4/00-install-packages/00-packages-bookworm b/stage4/00-install-packages/00-packages-bookworm
new file mode 100644
index 0000000..1a186dc
--- /dev/null
+++ b/stage4/00-install-packages/00-packages-bookworm
@@ -0,0 +1,19 @@
+python3-pygame
+python3 python3-tk thonny
+python3-pgzero
+python3-serial
+#python3-picamera
+debian-reference-en dillo
+pigpio python3-pigpio
+python3-pip
+python3-numpy
+pypy
+alacarte
+tree
+libgl1-mesa-dri libgles1 libgles2-mesa xcompmgr
+geany
+python3-twython
+python3-smbus
+python3-flask
+ffmpeg
+vlc
diff --git a/stage4/00-install-packages/00-packages-sys-raspi-bookworm b/stage4/00-install-packages/00-packages-sys-raspi-bookworm
new file mode 100644
index 0000000..167f269
--- /dev/null
+++ b/stage4/00-install-packages/00-packages-sys-raspi-bookworm
@@ -0,0 +1,9 @@
+raspberrypi-net-mods raspberrypi-ui-mods
+#python-picamera python3-picamera
+piclone
+wiringpi raspi-gpio python3-rpi.gpio
+python3-spidev
+alacarte rc-gui sense-hat
+pprompt
+piwiz
+rp-prefapps
diff --git a/stage4/00-install-packages/01-packages-bookworm b/stage4/00-install-packages/01-packages-bookworm
new file mode 100644
index 0000000..5441d9d
--- /dev/null
+++ b/stage4/00-install-packages/01-packages-bookworm
@@ -0,0 +1,22 @@
+python3-automationhat
+python3-blinkt
+python3-cap1xxx
+python3-drumhat
+python3-envirophat
+python3-explorerhat
+python3-fourletterphat
+python3-microdotphat
+python3-mote
+python3-motephat
+python3-phatbeat
+python3-pianohat
+python3-piglow
+python3-rainbowhat
+python3-scrollphat
+python3-scrollphathd
+python3-sn3218
+python3-skywriter
+python3-touchphat
+python3-buttonshim
+python3-unicornhathd
+python3-pantilthat
diff --git a/stage5/00-install-extras/00-packages-bookworm b/stage5/00-install-extras/00-packages-bookworm
new file mode 100644
index 0000000..a6aca43
--- /dev/null
+++ b/stage5/00-install-extras/00-packages-bookworm
@@ -0,0 +1,2 @@
+mu-editor
+claws-mail
diff --git a/stage5/00-install-extras/00-packages-sys-raspi-bookworm b/stage5/00-install-extras/00-packages-sys-raspi-bookworm
new file mode 100644
index 0000000..2d0c598
--- /dev/null
+++ b/stage5/00-install-extras/00-packages-sys-raspi-bookworm
@@ -0,0 +1,14 @@
+#sonic-pi
+#scratch nuscratch scratch3
+smartsim
+
+#minecraft-pi python-minecraftpi python-picraft python3-picraft
+python3-sense-emu sense-emu-tools python3-sense-emu-doc
+
+#wolfram-engine
+greenfoot-unbundled bluej
+#nodered
+realvnc-vnc-viewer
+
+python3-games
+code-the-classics
diff --git a/stage_rescue/00-install-packages/00-packages-sys-debian-bookworm b/stage_rescue/00-install-packages/00-packages-sys-debian-bookworm
new file mode 100644
index 0000000..439fb88
--- /dev/null
+++ b/stage_rescue/00-install-packages/00-packages-sys-debian-bookworm
@@ -0,0 +1,20 @@
+# debootstrap requirements (pi-gen requirements on target for reproduction)
+coreutils quilt parted qemu-user-static debootstrap zerofree zip dosfstools libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc qemu-utils kpartx squashfs-tools fatattr
+
+# iso-image requirements
+xorriso live-build syslinux isolinux squashfs-tools genisoimage
+
+hwinfo dmidecode cpuid cpufrequtils pciutils usbutils hwdata discover
+gnupg gnupg-agent gnupg2
+git git-buildpackage git-cola git-core git-cvs git-doc git-email git-gui git-man git-svn gitk
+nano pv vim
+gparted ntfs-3g hfsprogs dosfstools chntpw partclone
+xfsprogs
+isc-dhcp-client ifupdown network-manager net-tools
+wireless-tools wpasupplicant wpagui
+nfs-common nfs-kernel-server nfswatch
+smbclient cifs-utils
+rsync tcpdump wget openssh-server openssh-client iptables
+lsof rpcbind iptraf iftop wireshark tcpdump pcaputils ngrep
+sharutils psmisc patch less
+memtest86+