build(iso): drop py311-only extras from Python 3.12 lane

This commit is contained in:
Pi ISO Developer 2026-06-17 14:56:38 +02:00
parent e2e74e8418
commit 79ea3b4590
7 changed files with 10 additions and 15 deletions

View file

@ -456,7 +456,7 @@ installed onto the live rootfs.
**Two distinct categories live in the same file** with the same code **Two distinct categories live in the same file** with the same code
path (fetched, not installed on live), but different long-term homes: path (fetched, not installed on live), but different long-term homes:
1. **Desktop-spin leftovers** (telegram-desktop, mpv, abiword, gnumeric, 1. **Desktop-spin leftovers** (telegram-desktop, mpv, abiword,
simplescreenrecorder, …). Inherited from the earlier all-in-one simplescreenrecorder, …). Inherited from the earlier all-in-one
desktop image. Don't match the operator-USB role. **Long-term home: desktop image. Don't match the operator-USB role. **Long-term home:
disk-install only.** Not returning to the live USB. disk-install only.** Not returning to the live USB.
@ -483,7 +483,6 @@ disk-install consumer still needs to install
| ---------------------- | ------------------------------------------------------ | -----------------------------: | -------------: | ----------------- | | ---------------------- | ------------------------------------------------------ | -----------------------------: | -------------: | ----------------- |
| `blender` | Parametric 3D modelling + Python `bpy` skill substrate | (large; measure on next image) | (large) | roadmap-essential | | `blender` | Parametric 3D modelling + Python `bpy` skill substrate | (large; measure on next image) | (large) | roadmap-essential |
| `telegram-desktop` | Messaging | 52.08 MiB | 236.90 MiB | leftover | | `telegram-desktop` | Messaging | 52.08 MiB | 236.90 MiB | leftover |
| `gnumeric` | Spreadsheet | 13.14 MiB | 45.91 MiB | leftover |
| `abiword` | Word processor | 4.75 MiB | 21.60 MiB | leftover | | `abiword` | Word processor | 4.75 MiB | 21.60 MiB | leftover |
| `mpv` | Media player | 1.60 MiB | 6.96 MiB | leftover | | `mpv` | Media player | 1.60 MiB | 6.96 MiB | leftover |
| `simplescreenrecorder` | Screen/audio capture | 1.31 MiB | 3.83 MiB | leftover | | `simplescreenrecorder` | Screen/audio capture | 1.31 MiB | 3.83 MiB | leftover |
@ -515,7 +514,6 @@ dependencies from desktop applications, not an installer direction:
| `telegram-desktop` | `qt6-declarative`, `qt6-wayland`, `qt6-svg`, `qt6-lottie`, `kf6-*`, **`pipewire`** | | `telegram-desktop` | `qt6-declarative`, `qt6-wayland`, `qt6-svg`, `qt6-lottie`, `kf6-*`, **`pipewire`** |
| `simplescreenrecorder` | **`pulseaudio`**, **`pipewire`**, `qt6-base`, `ffmpeg` | | `simplescreenrecorder` | **`pulseaudio`**, **`pipewire`**, `qt6-base`, `ffmpeg` |
| `mpv` | `ffmpeg`, `libplacebo`, `mesa-libs`, `wayland`, `vulkan-loader` | | `mpv` | `ffmpeg`, `libplacebo`, `mesa-libs`, `wayland`, `vulkan-loader` |
| `gnumeric` | `python312`, `py312-pygobject`, `goffice` |
| `abiword` | `goffice`, `libgsf`, `wv` | | `abiword` | `goffice`, `libgsf`, `wv` |
`simplescreenrecorder` is the worst offender — a single niche tool drags `simplescreenrecorder` is the worst offender — a single niche tool drags
@ -560,8 +558,10 @@ Listed for completeness so the lean/full split stays honest:
- **Networking:** `tailscale`, `networkmgr`, `wifi-firmware-kmod`, - **Networking:** `tailscale`, `networkmgr`, `wifi-firmware-kmod`,
`FreeBSD-fwget`. `FreeBSD-fwget`.
- **Jails:** `bastille`. - **Jails:** `bastille`.
- **Operator diagnostics (tmux screenshot skill):** `tmux`, `screen`, - **Operator diagnostics:** `tmux`, `screen`, `mc`, `zip`, `unzip`,
`mc`, `zip`, `unzip`, `7-zip`, `python312`, `py312-pillow`, `dejavu`. `7-zip`, `python312`, `dejavu`. Python package-flavored extras such as
Pillow stay out of pkg lists until FreeBSD quarterly publishes Python 3.12
flavors.
- **Xorg base:** `xorg-minimal`, `xkeyboard-config`, `xkbcomp`, - **Xorg base:** `xorg-minimal`, `xkeyboard-config`, `xkbcomp`,
`xf86-input-libinput`, `xf86-video-scfb`, `xf86-video-intel`, `xf86-input-libinput`, `xf86-video-scfb`, `xf86-video-intel`,
`xf86-video-amdgpu`, `xf86-video-ati`, `drm-kmod`, `xf86-video-amdgpu`, `xf86-video-ati`, `drm-kmod`,

View file

@ -286,7 +286,7 @@ and allocated size; write the logical image to a USB key large enough for it.
tailscale version tailscale version
firefox firefox
tmux -V tmux -V
python3 -c "import PIL; print(PIL.__version__)" python3 --version
bastille --help bastille --help
mdo -u root bastille --help mdo -u root bastille --help
test -f /usr/local/share/fonts/dejavu/DejaVuSansMono.ttf test -f /usr/local/share/fonts/dejavu/DejaVuSansMono.ttf

View file

@ -523,7 +523,7 @@ command -v pi
pi --help pi --help
tailscale version tailscale version
tmux -V tmux -V
python3 -c "import PIL; print(PIL.__version__)" python3 --version
bastille --help bastille --help
mdo -u root bastille --help mdo -u root bastille --help
``` ```
@ -1087,7 +1087,7 @@ Mark the image good only when all of these are true:
- [ ] `pi --help` works - [ ] `pi --help` works
- [ ] `tailscale version` works - [ ] `tailscale version` works
- [ ] `tmux -V` works - [ ] `tmux -V` works
- [ ] `python3 -c "import PIL; print(PIL.__version__)"` works - [ ] `python3 --version` reports Python 3.12
- [ ] `bastille --help` works - [ ] `bastille --help` works
- [ ] `sudo` is absent from the live image - [ ] `sudo` is absent from the live image
- [ ] no stale-label confusion remains on the flashed USB stick - [ ] no stale-label confusion remains on the flashed USB stick

View file

@ -578,7 +578,7 @@ clawdie_shell_deploy_verify() {
log_msg "[deploy] ✓ Aider available" log_msg "[deploy] ✓ Aider available"
fi fi
else else
log_msg "[deploy] ⚠ Aider CLI not found (py312-aider_chat missing)" log_msg "[deploy] ⚠ Aider CLI not found (Aider venv setup missing)"
fi fi
return $failed return $failed

View file

@ -4,7 +4,7 @@
# Two categories live here. They share the same code path (fetched to the # Two categories live here. They share the same code path (fetched to the
# offline repo, not installed on live) but have different long-term homes: # offline repo, not installed on live) but have different long-term homes:
# #
# 1. Desktop-spin leftovers (telegram-desktop, mpv, abiword, gnumeric, ...). # 1. Desktop-spin leftovers (telegram-desktop, mpv, abiword, ...).
# Long-term home: disk-install only. Not coming back to the live USB. # Long-term home: disk-install only. Not coming back to the live USB.
# #
# 2. Roadmap-essential, deferred for stabilization (blender). First-class # 2. Roadmap-essential, deferred for stabilization (blender). First-class
@ -31,7 +31,6 @@ zed-editor
telegram-desktop telegram-desktop
epdfview epdfview
abiword abiword
gnumeric
antiword antiword
catdoc catdoc
xls2txt xls2txt

View file

@ -15,8 +15,6 @@ codex
# Python / tooling # Python / tooling
python312 python312
py312-pip
py312-aider_chat
just just
uv uv
ripgrep ripgrep
@ -35,7 +33,6 @@ postgresql18-client
dnsmasq dnsmasq
# Media / fonts # Media / fonts
py312-pillow
dejavu dejavu
# Wayland display stack (desktop installs) # Wayland display stack (desktop installs)

View file

@ -66,7 +66,6 @@ unzip
7-zip 7-zip
bitchx bitchx
python312 python312
py312-pillow
dejavu dejavu
# Hardware introspection. FreeBSD base already provides pciconf(8), # Hardware introspection. FreeBSD base already provides pciconf(8),
# usbconfig(8), devinfo(8), and kldstat(8); add a few extra probes that # usbconfig(8), devinfo(8), and kldstat(8); add a few extra probes that