From: Tobias Brunner Date: Wed, 28 Jun 2023 13:49:32 +0000 (+0200) Subject: testing: Install python-daemon via Debian package X-Git-Tag: android-2.4.2~22^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b8f26b407d9e90e8eeba02134568d7bf4a566d1;p=thirdparty%2Fstrongswan.git 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 7d51ec722c..e5c912a9a3 100755 --- 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 fb80b4e851..c318ac8c9a 100644 --- 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