From 1ec11f2a877933305b77d82e3e40fee28b0fee3f Mon Sep 17 00:00:00 2001 From: jo Date: Thu, 9 Sep 2021 16:30:24 +0200 Subject: [PATCH] Prepare Debian 11 support Start building docker dev images for testing purpose. --- .github/workflows/tools.yml | 2 ++ python_apps/airtime_analyzer/packages.ini | 42 +++++++++++------------ python_apps/pypo/packages.ini | 12 +++---- tools/packages.py | 2 +- 4 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index a91064143..ff97e606e 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -19,6 +19,8 @@ jobs: release: bionic - distribution: debian release: buster + - distribution: debian + release: bullseye env: REGISTRY: ghcr.io diff --git a/python_apps/airtime_analyzer/packages.ini b/python_apps/airtime_analyzer/packages.ini index 848ef9cde..5cc44835e 100644 --- a/python_apps/airtime_analyzer/packages.ini +++ b/python_apps/airtime_analyzer/packages.ini @@ -1,8 +1,8 @@ # This file contains a list of package dependencies. [common] -python3 = buster, bionic -python3-pip = buster, bionic -python3-venv = buster, bionic +python3 = buster, bullseye, bionic +python3-pip = buster, bullseye, bionic +python3-venv = buster, bullseye, bionic [liquidsoap] # https://github.com/savonet/liquidsoap/blob/main/CHANGES.md @@ -21,30 +21,30 @@ liquidsoap-plugin-portaudio = bionic ; liquidsoap-plugin-taglib = bionic ; liquidsoap-plugin-voaacenc = bionic ; liquidsoap-plugin-vorbis = bionic -liquidsoap = buster, bionic +liquidsoap = buster, bullseye, bionic [pika] -python3-pika = buster, bionic +python3-pika = buster, bullseye, bionic [rgain3] -gcc = buster, bionic -gir1.2-gtk-3.0 = buster, bionic -gstreamer1.0-plugins-bad = buster, bionic -gstreamer1.0-plugins-good = buster, bionic -gstreamer1.0-plugins-ugly = buster, bionic -libcairo2-dev = buster, bionic -libgirepository1.0-dev = buster, bionic -libglib2.0-dev = buster, bionic -pkg-config = buster, bionic -python3-cairo = buster, bionic -python3-dev = buster, bionic -python3-gi = buster, bionic -python3-gi-cairo = buster, bionic -python3-gst-1.0 = buster, bionic +gcc = buster, bullseye, bionic +gir1.2-gtk-3.0 = buster, bullseye, bionic +gstreamer1.0-plugins-bad = buster, bullseye, bionic +gstreamer1.0-plugins-good = buster, bullseye, bionic +gstreamer1.0-plugins-ugly = buster, bullseye, bionic +libcairo2-dev = buster, bullseye, bionic +libgirepository1.0-dev = buster, bullseye, bionic +libglib2.0-dev = buster, bullseye, bionic +pkg-config = buster, bullseye, bionic +python3-cairo = buster, bullseye, bionic +python3-dev = buster, bullseye, bionic +python3-gi = buster, bullseye, bionic +python3-gi-cairo = buster, bullseye, bionic +python3-gst-1.0 = buster, bullseye, bionic [silan] -silan = buster, bionic +silan = buster, bullseye, bionic [=development] # Generate fixtures -ffmpeg = buster, bionic +ffmpeg = buster, bullseye, bionic diff --git a/python_apps/pypo/packages.ini b/python_apps/pypo/packages.ini index 0f7aafad7..a4dbff5b2 100644 --- a/python_apps/pypo/packages.ini +++ b/python_apps/pypo/packages.ini @@ -1,8 +1,8 @@ # This file contains a list of package dependencies. [common] -python3 = buster, bionic -python3-pip = buster, bionic -python3-venv = buster, bionic +python3 = buster, bullseye, bionic +python3-pip = buster, bullseye, bionic +python3-venv = buster, bullseye, bionic [liquidsoap] # https://github.com/savonet/liquidsoap/blob/main/CHANGES.md @@ -21,12 +21,12 @@ liquidsoap-plugin-portaudio = bionic ; liquidsoap-plugin-taglib = bionic ; liquidsoap-plugin-voaacenc = bionic ; liquidsoap-plugin-vorbis = bionic -liquidsoap = buster, bionic +liquidsoap = buster, bullseye, bionic [recorder] -ecasound = buster, bionic +ecasound = buster, bullseye, bionic [misc] # Used by pypofetch to check if a file is open. # TODO: consider using a python library -lsof = buster, bionic +lsof = buster, bullseye, bionic diff --git a/tools/packages.py b/tools/packages.py index ed5c32a26..6ee3be25d 100755 --- a/tools/packages.py +++ b/tools/packages.py @@ -7,7 +7,7 @@ from typing import Iterator, Set DEFAULT_PACKAGES_FILENAME = "packages.ini" FORMATS = ("list", "line") -SYSTEMS = ("buster", "bionic") +SYSTEMS = ("buster", "bullseye", "bionic") SETTINGS_SECTION = "=settings" DEVELOPMENT_SECTION = "=development"