diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-02-29 03:07:07 +0100 |
|---|---|---|
| committer | Jernej Jakob <jernej.jakob@gmail.com> | 2020-02-29 03:07:07 +0100 |
| commit | c6864ed0eb479ea9116724cbc62e823e487fcf2d (patch) | |
| tree | be527b3ec8888350b76458953fff1b276d7bb508 | |
| parent | 1c4414dd363bdb268038ae238686be3e0b7f988b (diff) | |
| download | vyos-build-c6864ed0eb479ea9116724cbc62e823e487fcf2d.tar.gz vyos-build-c6864ed0eb479ea9116724cbc62e823e487fcf2d.zip | |
T2085: fix building of keepalived
| -rw-r--r-- | docker/Dockerfile | 17 | ||||
| -rwxr-xr-x | scripts/build-packages | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c92c2b84..ea3f3d9c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -273,14 +273,21 @@ RUN apt-get update && apt-get install -y \ # Packages needed for keepalived RUN apt-get update && apt-get install -y \ - libnl-3-200 \ + autoconf \ + debhelper \ + libglib2.0-dev \ + libjson-c-dev \ libnl-3-dev \ - libnl-nf-3-200 \ + libnl-genl-3-dev \ + libpopt-dev \ + libsnmp-dev \ + libssl-dev \ libnl-nf-3-dev \ + libnfnetlink-dev \ libipset-dev \ - libnl-genl-3-200 \ - libnl-genl-3-dev \ - libpopt-dev + iptables-dev \ + linux-libc-dev \ + pkg-config # Packages needed for Qemu test-suite # This is for now only supported on i386 and amd64 platforms diff --git a/scripts/build-packages b/scripts/build-packages index 953f1d05..7329a845 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -232,10 +232,7 @@ pkg_special.append( add_package('frr', url='https://github.com/FRRouting/frr.git # # We use keepalived from Debian Buster # -keepalived_build_cmd = "sed -i 's/debhelper (>= 11)/debhelper (>= 9)/' debian/control && " \ - "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) ) +pkg_special.append( add_package('keepalived', url='https://salsa.debian.org/ipvs-team/pkg-keepalived.git', branch='master', commit='eae91c81')) # # Linux (VyOS) Kernel |