From dff5a0cab8794b744112380c974dfe116ea2ce96 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 21 Sep 2021 11:15:43 +0200 Subject: [PATCH] testing: Support build with Debian bullseye base image --- testing/scripts/build-baseimage | 21 ++++++++++++++++++--- testing/scripts/build-guestimages | 5 ++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 10253a564a..657851a34c 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -20,8 +20,16 @@ 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,iptables-dev -INC=$INC,libxerces-c-dev,libgcrypt20-dev,traceroute +INC=$INC,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3 +INC=$INC,libxerces-c-dev,libgcrypt20-dev,traceroute,iptables +case "$BASEIMGSUITE" in +bullseye) + INC=$INC,libiptc-dev + ;; +*) + INC=$INC,iptables-dev + ;; +esac case "$BASEIMGSUITE" in jessie) INC=$INC,libahven4-dev,libxmlada5-dev,libgmpada5-dev @@ -35,6 +43,13 @@ 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 + # 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 + ;; *) echo_warn "Package list for '$BASEIMGSUITE' might has to be updated" ;; @@ -136,7 +151,7 @@ do done case "$BASEIMGSUITE" in -buster) +buster|bullseye) log_action "Switching from iptables-nft to iptables-legacy" execute_chroot "update-alternatives --set iptables /usr/sbin/iptables-legacy" 0 execute_chroot "update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy" 0 diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index 4ef881836d..bb638ec446 100755 --- a/testing/scripts/build-guestimages +++ b/testing/scripts/build-guestimages @@ -75,7 +75,10 @@ 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 - for service in "apache2 slapd bind9" + # on bullseye, enabling via bind9 doesn't work, while disabling does, so + # use named there. on the other hand, older releases don't have named + # service files (systemctl returns 0 even if files are not found) + for service in apache2 slapd bind9 named do execute_chroot "systemctl enable $service" 0 done -- 2.47.2