From ccca04588d3ef51c5864870b369e06a1f556e636 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Wed, 2 Apr 2025 19:49:22 +0200 Subject: [PATCH] os: Upgrade python3-libcamera to fix issue on bookworm See https://github.com/raspberrypi/picamera2/issues/1229#issuecomment-2772493538 --- documentation/docs/community/contribute/tips-and-tricks.md | 3 ++- software/distro/setup/ci-record-version.sh | 2 +- .../python-hardware-controller/install.sh | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/documentation/docs/community/contribute/tips-and-tricks.md b/documentation/docs/community/contribute/tips-and-tricks.md index 689a295ea..6a3619f06 100644 --- a/documentation/docs/community/contribute/tips-and-tricks.md +++ b/documentation/docs/community/contribute/tips-and-tricks.md @@ -55,7 +55,7 @@ Start by [installing WSL (Ubuntu)](https://learn.microsoft.com/en-us/windows/wsl Because of a small incompatibilty between Windows and Linux; we recommend cloning the repo "in WSL" but if you prefer keeping your git clone "in Windows", here are other options: * [Git line endings](https://learn.microsoft.com/en-us/windows/wsl/tutorials/wsl-git#git-line-endings) * [Visual Studio Code WSL extension](https://code.visualstudio.com/docs/remote/wsl) -* + Then follow the Ubuntu instructions below. @@ -83,6 +83,7 @@ poetry install --no-root Run live previewer: ```sh +cd documentation poetry run poe preview ``` diff --git a/software/distro/setup/ci-record-version.sh b/software/distro/setup/ci-record-version.sh index 4fefdc191..fdf41dc2d 100755 --- a/software/distro/setup/ci-record-version.sh +++ b/software/distro/setup/ci-record-version.sh @@ -1,6 +1,6 @@ #!/bin/bash -eu # This script records OS installation versioning information in the same way as the -# install.planktoscope.community/distro.sh script does. To invnoke it, you must set the following +# install.planktoscope.community/distro.sh script does. To invoke it, you must set the following # environment variables: # REPO (the repo used for setup, e.g. github.com/PlanktoScope/PlanktoScope) # VERSION_QUERY (the version query, e.g. a commit hash) diff --git a/software/distro/setup/planktoscope-app-env/python-hardware-controller/install.sh b/software/distro/setup/planktoscope-app-env/python-hardware-controller/install.sh index 251f41c67..21f0a8657 100755 --- a/software/distro/setup/planktoscope-app-env/python-hardware-controller/install.sh +++ b/software/distro/setup/planktoscope-app-env/python-hardware-controller/install.sh @@ -21,6 +21,11 @@ esac sudo -E apt-get install -y -o Dpkg::Progress-Fancy=0 \ git python3-pip python3-venv +## Upgrade python3-libcamera to solve an issue in Raspberry Pi OS bookworm-2024-11-19 +## https://github.com/raspberrypi/picamera2/issues/1229#issuecomment-2772493538 +sudo -E apt-get install -y -o Dpkg::Progress-Fancy=0 --only-upgrade \ + python3-libcamera + # Suppress keyring dialogs when setting up the PlanktoScope distro on a graphical desktop # (see https://github.com/pypa/pip/issues/7883) export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring