T2085: fix building of keepalived

This commit is contained in:
Jernej Jakob 2020-02-29 03:07:07 +01:00
parent 1c4414dd36
commit c6864ed0eb
2 changed files with 14 additions and 10 deletions

View File

@ -273,14 +273,21 @@ RUN apt-get update && apt-get install -y \
# Packages needed for keepalived # Packages needed for keepalived
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libnl-3-200 \ autoconf \
debhelper \
libglib2.0-dev \
libjson-c-dev \
libnl-3-dev \ libnl-3-dev \
libnl-nf-3-200 \
libnl-nf-3-dev \
libipset-dev \
libnl-genl-3-200 \
libnl-genl-3-dev \ libnl-genl-3-dev \
libpopt-dev libpopt-dev \
libsnmp-dev \
libssl-dev \
libnl-nf-3-dev \
libnfnetlink-dev \
libipset-dev \
iptables-dev \
linux-libc-dev \
pkg-config
# Packages needed for Qemu test-suite # Packages needed for Qemu test-suite
# This is for now only supported on i386 and amd64 platforms # This is for now only supported on i386 and amd64 platforms

View File

@ -232,10 +232,7 @@ pkg_special.append( add_package('frr', url='https://github.com/FRRouting/frr.git
# #
# We use keepalived from Debian Buster # We use keepalived from Debian Buster
# #
keepalived_build_cmd = "sed -i 's/debhelper (>= 11)/debhelper (>= 9)/' debian/control && " \ pkg_special.append( add_package('keepalived', url='https://salsa.debian.org/ipvs-team/pkg-keepalived.git', branch='master', commit='eae91c81'))
"echo 9 > debian/compat && " \
"dpkg-buildpackage -b -us -uc -tc -j$(getconf _NPROCESSORS_ONLN)"
pkg_special.append( add_package('keepalived', url='https://salsa.debian.org/ipvs-team/pkg-keepalived.git', branch='master', commit='eae91c81', custombuild_cmd=keepalived_build_cmd) )
# #
# Linux (VyOS) Kernel # Linux (VyOS) Kernel