testing: Add support for Debian bookworm base images
By default, rsyslog is not installed anymore to avoid storing everything twice (since journald is the default). If this becomes an issue, we could delete /var/log/journal to only log via rsyslog.
This commit is contained in:
1 parent
21bf3e41f9
commit
6f7fdcadd1
1 file changed
+18
-5
@@ -21,13 +21,13 @@ 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-daemon,python3-venv,
|
||||
INC=$INC,apt-transport-https,libjson-c-dev,libxslt1-dev,libapache2-mod-wsgi-py3
|
||||
INC=$INC,libxerces-c-dev
|
||||
INC=$INC,libxerces-c-dev,rsyslog
|
||||
case "$BASEIMGSUITE" in
|
||||
bullseye)
|
||||
INC=$INC,libiptc-dev
|
||||
buster)
|
||||
INC=$INC,iptables-dev
|
||||
;;
|
||||
*)
|
||||
INC=$INC,iptables-dev
|
||||
INC=$INC,libiptc-dev
|
||||
;;
|
||||
esac
|
||||
case "$BASEIMGSUITE" in
|
||||
@@ -42,6 +42,13 @@ bullseye)
|
||||
# package (libboost-regex1.74.0-icu67), which debootstrap can't resolve (#878961)
|
||||
INC=$INC,libboost-regex1.74.0
|
||||
;;
|
||||
bookworm)
|
||||
INC=$INC,libahven11-dev,libxmlada-schema12-dev,libgmpada12-dev
|
||||
INC=$INC,libalog8-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"
|
||||
;;
|
||||
@@ -52,7 +59,13 @@ INC=$INC,${SERVICES// /,}
|
||||
APT1="libgcrypt20-dev traceroute iptables"
|
||||
APT="tmux"
|
||||
# additional services to disable
|
||||
SERVICES="$SERVICES systemd-timesyncd.service"
|
||||
case "$BASEIMGSUITE" in
|
||||
bookworm)
|
||||
;;
|
||||
*)
|
||||
SERVICES="$SERVICES systemd-timesyncd"
|
||||
;;
|
||||
esac
|
||||
|
||||
CACHEDIR=$BUILDDIR/cache
|
||||
APTCACHE=$LOOPDIR/var/cache/apt/archives
|
||||
|
||||
Reference in new issue
Block a user