@@ -84,6 +84,11 @@ if [ ${RELEASE_CODENAME} == 'bionic' ] ; then
84
84
SITLCFML_VERSION=" 2.4"
85
85
PYTHON_V=" python3"
86
86
PIP=pip3
87
+ elif [ ${RELEASE_CODENAME} == ' bookworm' ]; then
88
+ SITLFML_VERSION=" 2.5"
89
+ SITLCFML_VERSION=" 2.5"
90
+ PYTHON_V=" python3"
91
+ PIP=pip3
87
92
elif [ ${RELEASE_CODENAME} == ' buster' ]; then
88
93
SITLFML_VERSION=" 2.5"
89
94
SITLCFML_VERSION=" 2.5"
162
167
ARM_LINUX_PKGS=" g++-arm-linux-gnueabihf $INSTALL_PKG_CONFIG "
163
168
# python-wxgtk packages are added to SITL_PKGS below
164
169
165
- if [ ${RELEASE_CODENAME} == ' lunar' ] ||
170
+ if [ ${RELEASE_CODENAME} == ' bookworm' ] ||
171
+ [ ${RELEASE_CODENAME} == ' lunar' ] ||
166
172
[ ${RELEASE_CODENAME} == ' mantic' ]; then
167
173
# on Lunar (and presumably later releases), we install in venv, below
168
174
PYTHON_PKGS+=" numpy pyparsing psutil"
173
179
174
180
# add some packages required for commonly-used MAVProxy modules:
175
181
if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
176
- if [ ${RELEASE_CODENAME} == ' lunar' ] ||
182
+ if [ ${RELEASE_CODENAME} == ' bookworm' ] ||
183
+ [ ${RELEASE_CODENAME} == ' lunar' ] ||
177
184
[ ${RELEASE_CODENAME} == ' mantic' ]; then
178
185
PYTHON_PKGS+=" matplotlib scipy opencv-python pyyaml"
179
186
SITL_PKGS+=" xterm libcsfml-dev libcsfml-audio${SITLCFML_VERSION} libcsfml-dev libcsfml-graphics${SITLCFML_VERSION} libcsfml-network${SITLCFML_VERSION} libcsfml-system${SITLCFML_VERSION} libcsfml-window${SITLCFML_VERSION} libsfml-audio${SITLFML_VERSION} libsfml-dev libsfml-graphics${SITLFML_VERSION} libsfml-network${SITLFML_VERSION} libsfml-system${SITLFML_VERSION} libsfml-window${SITLFML_VERSION} "
@@ -261,6 +268,8 @@ elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
261
268
[ ${RELEASE_CODENAME} == ' jammy' ]; then
262
269
BASE_PKGS+=" python-is-python3"
263
270
SITL_PKGS+=" libpython3-stdlib" # for argparse
271
+ elif [ ${RELEASE_CODENAME} == ' bookworm' ]; then
272
+ SITL_PKGS+=" libpython3-stdlib" # for argparse
264
273
elif [ ${RELEASE_CODENAME} == ' lunar' ]; then
265
274
SITL_PKGS+=" libpython3-stdlib" # for argparse
266
275
elif [ ${RELEASE_CODENAME} == ' buster' ]; then
@@ -277,6 +286,8 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
277
286
elif [ ${RELEASE_CODENAME} == ' groovy' ] ||
278
287
[ ${RELEASE_CODENAME} == ' focal' ]; then
279
288
SITL_PKGS+=" libjpeg8-dev"
289
+ elif [ ${RELEASE_CODENAME} == ' bookworm' ]; then
290
+ SITL_PKGS+=" libgtk-3-dev libwxgtk3.2-dev "
280
291
elif [ ${RELEASE_CODENAME} == ' lunar' ]; then
281
292
SITL_PKGS+=" libgtk-3-dev libwxgtk3.2-dev "
282
293
elif [ ${RELEASE_CODENAME} == ' mantic' ]; then
@@ -293,10 +304,14 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
293
304
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libjpeg8-dev libpng12-0 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame
294
305
fi
295
306
296
- if [ ${RELEASE_CODENAME} == ' lunar ' ]; then
307
+ if [ ${RELEASE_CODENAME} == ' bookworm ' ]; then
297
308
PYTHON_PKGS+=" opencv-python"
298
309
SITL_PKGS+=" python3-wxgtk4.0"
299
310
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame
311
+ elif [ ${RELEASE_CODENAME} == ' lunar' ]; then
312
+ PYTHON_PKGS+=" wxpython opencv-python"
313
+ SITL_PKGS+=" python3-wxgtk4.0"
314
+ SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame
300
315
elif [ ${RELEASE_CODENAME} == ' mantic' ]; then
301
316
PYTHON_PKGS+=" wxpython opencv-python"
302
317
SITL_PKGS+=" python3-wxgtk4.0"
343
358
PIP_USER_ARGUMENT=" --user"
344
359
345
360
# create a Python venv on more recent releases:
346
- if [ ${RELEASE_CODENAME} == ' lunar' ] ||
361
+ if [ ${RELEASE_CODENAME} == ' bookworm' ] ||
362
+ [ ${RELEASE_CODENAME} == ' lunar' ] ||
347
363
[ ${RELEASE_CODENAME} == ' mantic' ]; then
348
364
$APT_GET install python3.11-venv
349
365
python3 -m venv $HOME /venv-ardupilot
@@ -369,7 +385,8 @@ if [ "$GITHUB_ACTIONS" == "true" ]; then
369
385
PIP_USER_ARGUMENT+=" --progress-bar off"
370
386
fi
371
387
372
- if [ ${RELEASE_CODENAME} == ' lunar' ] ||
388
+ if [ ${RELEASE_CODENAME} == ' bookworm' ] ||
389
+ [ ${RELEASE_CODENAME} == ' lunar' ] ||
373
390
[ ${RELEASE_CODENAME} == ' mantic' ]; then
374
391
# must do this ahead of wxPython pip3 run :-/
375
392
$PIP install $PIP_USER_ARGUMENT -U attrdict3
0 commit comments