ikev2: use remote proposals when installing tunnel

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 3514071..a35fac5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,8 +65,7 @@ DEB_DEPENDS  = curl build-essential autoconf automake ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python3-all python3-setuptools
-DEB_DEPENDS += python-virtualenv python-pip check
+DEB_DEPENDS += python3-all python3-setuptools check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
 DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
 DEB_DEPENDS += python3-venv  # ensurepip
@@ -75,20 +74,22 @@ DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
 
 LIBFFI=libffi6 # works on all but 20.04
 
-ifeq ($(OS_VERSION_ID),16.04)
-       DEB_DEPENDS += python-dev
-       DEB_DEPENDS += libssl-dev
-else ifeq ($(OS_VERSION_ID),18.04)
-       DEB_DEPENDS += python-dev
+ifeq ($(OS_VERSION_ID),18.04)
+       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
        DEB_DEPENDS += libssl-dev
        DEB_DEPENDS += clang-9
 else ifeq ($(OS_VERSION_ID),20.04)
+       DEB_DEPENDS += python3-virtualenv
+       DEB_DEPENDS += libssl-dev
        LIBFFI=libffi7
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
        DEB_DEPENDS += libssl-dev
+       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
        APT_ARGS = -t jessie-backports
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
        DEB_DEPENDS += libssl1.0-dev
+       DEB_DEPENDS += python-all python-pip
+       DEB_DEPENDS += python-dev python-all python-pip python-virtualenv
 else
        DEB_DEPENDS += libssl-dev
 endif
@@ -104,6 +105,8 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel
 RPM_DEPENDS += ninja-build
 RPM_DEPENDS += libuuid-devel
 RPM_DEPENDS += mbedtls-devel
+RPM_DEPENDS += ccache
+RPM_DEPENDS += xmlto
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
@@ -117,7 +120,7 @@ ifeq ($(OS_ID),fedora)
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        RPM_DEPENDS += yum-utils
        RPM_DEPENDS += compat-openssl10
-       RPM_DEPENDS += python36-devel python3-ply
+       RPM_DEPENDS += python2-devel python36-devel python3-ply
        RPM_DEPENDS += python3-virtualenv python3-jsonschema
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'Development Tools'
@@ -317,6 +320,8 @@ ifeq ($(OS_ID),rhel)
        @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
+       @sudo -E dnf install $(CONFIRM) epel-release
+       @sudo -E dnf config-manager --set-enabled PowerTools
        @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)