sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-04 00:00:14 -04:00
Code Issues Projects Releases Wiki Activity

testing: Support build with Debian bullseye base image

Browse Source
This commit is contained in:
Tobias Brunner 2021-09-21 11:15:43 +02:00
parent f92ad8454b
commit dff5a0cab8
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
testing/scripts/build-baseimage
View File

@ -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

5
testing/scripts/build-guestimages
View File

@ -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