X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=4e886a9c2063a86d7ca2d9e407a53dfce8347c75;hb=d6eed1bb207291e4541f45f229d71358bfb35165;hp=50f33bc8922d26c229af1d673c3822436906969f;hpb=bfcd23968246086b5b884f7df1e78adb1a059724;p=vpp.git diff --git a/Makefile b/Makefile index 50f33bc8922..4e886a9c206 100644 --- a/Makefile +++ b/Makefile @@ -67,11 +67,11 @@ DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-python DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += lcov chrpath autoconf libnuma-dev DEB_DEPENDS += python3-all python3-setuptools check -DEB_DEPENDS += libffi-dev python3-ply libmbedtls-dev +DEB_DEPENDS += libffi-dev python3-ply DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml DEB_DEPENDS += python3-venv # ensurepip DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil -DEB_DEPENDS += libnl-3-dev libnl-route-3-dev +DEB_DEPENDS += libnl-3-dev libnl-route-3-dev libmnl-dev DEB_DEPENDS += enchant # for docs DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += libssl-dev @@ -116,7 +116,7 @@ RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += ccache RPM_DEPENDS += xmlto RPM_DEPENDS += elfutils-libelf-devel -RPM_DEPENDS += libnl3-devel +RPM_DEPENDS += libnl3-devel libmnl-devel ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils @@ -414,7 +414,7 @@ define test $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) $(eval libs:=lib lib64) make -C test \ - VPP_BUILD_DIR=$(BR)/build-$(2)-native \ + VPP_BUILD_DIR=$(BR)/build-$(2)-native/vpp \ VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \ EXTENDED_TESTS=$(EXTENDED_TESTS) \