testing: Add support for Debian trixie base images

This commit is contained in:
Tobias Brunner 2025-08-15 14:47:44 +02:00
parent 518b8e4286
commit 1767ba2a13
2 changed files with 9 additions and 28 deletions

View File

@ -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,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,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,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,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,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 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) bullseye)
INC=$INC,libahven9-dev,libxmlada-schema10-dev,libgmpada10-dev INC=$INC,libahven9-dev,libxmlada-schema10-dev,libgmpada10-dev
INC=$INC,libalog6-dev,dbus-user-session INC=$INC,libalog6-dev,dbus-user-session
@ -44,11 +32,15 @@ bullseye)
;; ;;
bookworm) bookworm)
INC=$INC,libahven11-dev,libxmlada-schema12-dev,libgmpada12-dev 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 # workaround for dependency issue gdb -> libsource-highlight4v5 -> virtual
# package (libboost-regex1.74.0-icu67), which debootstrap can't resolve (#878961) # package (libboost-regex1.74.0-icu67), which debootstrap can't resolve (#878961)
INC=$INC,libboost-regex1.74.0 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" echo_warn "Package list for '$BASEIMGSUITE' might has to be updated"
;; ;;
@ -60,7 +52,7 @@ APT1="libgcrypt20-dev traceroute iptables"
APT="tmux" APT="tmux"
# additional services to disable # additional services to disable
case "$BASEIMGSUITE" in case "$BASEIMGSUITE" in
bookworm) bookworm|trixie)
;; ;;
*) *)
SERVICES="$SERVICES systemd-timesyncd" SERVICES="$SERVICES systemd-timesyncd"

View File

@ -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 org. /etc/bind/db.org" 0
execute_chroot "dnssec-signzone -K /etc/bind -o . /etc/bind/db.root" 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 SERVICES="apache2 slapd named"
# 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
for service in $SERVICES for service in $SERVICES
do do
execute_chroot "systemctl enable $service" 0 execute_chroot "systemctl enable $service" 0