testing: Install python-daemon via Debian package

System-wide installation via pip isn't easily possible anymore on Debian
bookworm, so just use the Debian package for this (is available in old
releases as well).

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 7d51ec722c57934bce6fa5bf8a44035a2f7b73a4..e5c912a9a3ca7deded0b1a091cde2ca0a12a2b63 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -19,8 +19,8 @@ INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libltdl-dev,wget,gnupg,man-db
 INC=$INC,libboost-thread-dev,libboost-system-dev,git,iperf,htop,valgrind,strace
 INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev
 INC=$INC,dnsutils,libsoup2.4-dev,ca-certificates,unzip,libsystemd-dev
-INC=$INC,python3,python3-setuptools,python3-dev,python3-pip,apt-transport-https
-INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3
+INC=$INC,python3,python3-setuptools,python3-dev,python3-pip,python3-daemon,
+INC=$INC,apt-transport-https,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3
 INC=$INC,libxerces-c-dev
 case "$BASEIMGSUITE" in
 bullseye)

diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index fb80b4e8514257c6befcc00acd477673b6920cb8..c318ac8c9a9e7e9ce5367265139f7e0e2d9802c3 100644 (file)
--- a/testing/scripts/recipes/013_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -130,5 +130,3 @@ build: configure
 install: build
        cd $(BUILDDIR) && make -j install && \
                cd $(DIR)/src/libcharon/plugins/vici/python && python3 setup.py install
-       # for Python-based updown scripts
-       pip3 install python-daemon