testing: Add support for Debian trixie base images

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index ce8bdc69009769747c58518bd422c1848ad3fab5..37dfef2d43bb3d1615245ffee3e6b37139dd9956 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -18,23 +18,11 @@ INC=$INC,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc
 INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libltdl-dev,wget,gnupg,man-db
 INC=$INC,libboost-thread-dev,libboost-system-dev,git,iperf3,htop,valgrind,strace
 INC=$INC,gnat,gprbuild,acpid,acpi-support-base,libldns-dev,libunbound-dev
-INC=$INC,dnsutils,ca-certificates,unzip,libsystemd-dev
+INC=$INC,bind9-dnsutils,ca-certificates,unzip,libsystemd-dev
 INC=$INC,python3,python3-setuptools,python3-build,python3-dev,python3-daemon,python3-venv,
 INC=$INC,apt-transport-https,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3
-INC=$INC,libxerces-c-dev,rsyslog,ncat,socat
+INC=$INC,libxerces-c-dev,rsyslog,ncat,socat,libiptc-dev,binutils-dev
 case "$BASEIMGSUITE" in
-buster)
-       INC=$INC,iptables-dev
-       ;;
-*)
-       INC=$INC,libiptc-dev
-       ;;
-esac
-case "$BASEIMGSUITE" in
-buster)
-       INC=$INC,libahven7-dev,libxmlada-schema8-dev,libgmpada8-dev
-       INC=$INC,libalog4-dev,dbus-user-session
-       ;;
 bullseye)
        INC=$INC,libahven9-dev,libxmlada-schema10-dev,libgmpada10-dev
        INC=$INC,libalog6-dev,dbus-user-session
@@ -44,11 +32,15 @@ bullseye)
        ;;
 bookworm)
        INC=$INC,libahven11-dev,libxmlada-schema12-dev,libgmpada12-dev
-       INC=$INC,libalog8-dev,dbus-user-session
+       INC=$INC,libalog8-dev,dbus-user-session,pipx
        # workaround for dependency issue gdb -> libsource-highlight4v5 -> virtual
        # package (libboost-regex1.74.0-icu67), which debootstrap can't resolve (#878961)
        INC=$INC,libboost-regex1.74.0
        ;;
+trixie)
+       INC=$INC,libahven-dev,libxmlada-schema-dev,libgmpada-dev
+       INC=$INC,libalog-dev,dbus-user-session,pipx,systemd-dev
+       ;;
 *)
        echo_warn "Package list for '$BASEIMGSUITE' might has to be updated"
        ;;
@@ -60,7 +52,7 @@ APT1="libgcrypt20-dev traceroute iptables"
 APT="tmux"
 # additional services to disable
 case "$BASEIMGSUITE" in
-bookworm)
+bookworm|trixie)
        ;;
 *)
        SERVICES="$SERVICES systemd-timesyncd"

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index 511974624f055bbdbbf35a52289c9955f0859faa..caf42311170fc8d0091c81c3673343e72f3d9a0f 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -76,18 +76,7 @@ do
                execute_chroot "dnssec-signzone -K /etc/bind -o org. /etc/bind/db.org" 0
                execute_chroot "dnssec-signzone -K /etc/bind -o . /etc/bind/db.root" 0
 
-               # on bullseye and newer, enabling via bind9 doesn't work, while
-               # disabling does, so use named here. on the other hand, older releases
-               # like buster don't have named service files
-               SERVICES="apache2 slapd"
-               case "$BASEIMGSUITE" in
-               buster)
-                       SERVICES="$SERVICES bind9"
-                       ;;
-               *)
-                       SERVICES="$SERVICES named"
-                       ;;
-               esac
+               SERVICES="apache2 slapd named"
                for service in $SERVICES
                do
                        execute_chroot "systemctl enable $service" 0