X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=5b7dd36d77b44b4f27c390cd9c487952a2e0c918;hb=291307e427e37ea6d31a85db53dc87665e076734;hp=52f4a2655cb189781f0551a129aeb6f4a965987b;hpb=e56008519b87d7ac8d4e5e5cce7be3233ee1727b;p=vpp.git

diff --git a/Makefile b/Makefile
index 52f4a2655cb..5b7dd36d77b 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
@@ -168,12 +168,12 @@ RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
 ifeq ($(OS_ID),opensuse-leap)
 ifeq ($(OS_VERSION_ID),15.3)
 	RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel xmlto
-	RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel lsb-release
+	RPM_SUSE_DEVEL_DEPS += lsb-release
 	RPM_SUSE_DEVEL_DEPS += asciidoc git
 	RPM_SUSE_PYTHON_DEPS += python3 python2-ply
 endif
 ifeq ($(OS_VERSION_ID),15.0)
-	RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc git curl
+	RPM_SUSE_DEVEL_DEPS += gcc git curl
 	RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
 endif
 endif
@@ -411,41 +411,41 @@ export TEST_DIR ?= $(WS_ROOT)/test
 export RND_SEED ?= $(shell python3 -c 'import time; print(time.time())')
 
 define test
-	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
+	$(if $(filter-out $(2),retest),make -C $(BR) PLATFORM=vpp TAG=$(1) vpp-install,)
 	$(eval libs:=lib lib64)
 	make -C test \
-	  VPP_BUILD_DIR=$(BR)/build-$(2)-native \
-	  VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
-	  VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \
+	  VPP_BUILD_DIR=$(BR)/build-$(1)-native/vpp \
+	  VPP_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
+	  VPP_INSTALL_PATH=$(BR)/install-$(1)-native/ \
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  PYTHON=$(PYTHON) \
 	  OS_ID=$(OS_ID) \
 	  RND_SEED=$(RND_SEED) \
 	  CACHE_OUTPUT=$(CACHE_OUTPUT) \
-	  $(3)
+	  $(2)
 endef
 
 .PHONY: test
 test:
-	$(call test,vpp,vpp,test)
+	$(call test,vpp,test)
 
 .PHONY: test-debug
 test-debug:
-	$(call test,vpp,vpp_debug,test)
+	$(call test,vpp_debug,test)
 
 .PHONY: test-gcov
 test-gcov:
-	$(call test,vpp,vpp_gcov,test)
+	$(call test,vpp_gcov,test)
 
 .PHONY: test-all
 test-all:
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp,vpp,test)
+	$(call test,vpp,test)
 
 .PHONY: test-all-debug
 test-all-debug:
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp,vpp_debug,test)
+	$(call test,vpp_debug,test)
 
 .PHONY: papi-wipe
 papi-wipe: test-wipe-papi
@@ -465,15 +465,15 @@ test-wipe:
 
 .PHONY: test-shell
 test-shell:
-	$(call test,vpp,vpp,shell)
+	$(call test,vpp,shell)
 
 .PHONY: test-shell-debug
 test-shell-debug:
-	$(call test,vpp,vpp_debug,shell)
+	$(call test,vpp_debug,shell)
 
 .PHONY: test-shell-gcov
 test-shell-gcov:
-	$(call test,vpp,vpp_gcov,shell)
+	$(call test,vpp_gcov,shell)
 
 .PHONY: test-dep
 test-dep:
@@ -492,7 +492,7 @@ test-wipe-doc:
 .PHONY: test-cov
 test-cov:
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp,vpp_gcov,cov)
+	$(call test,vpp_gcov,cov)
 
 .PHONY: test-wipe-cov
 test-wipe-cov:
@@ -516,29 +516,29 @@ test-refresh-deps:
 
 .PHONY: retest
 retest:
-	$(call test,vpp,vpp,retest)
+	$(call test,vpp,retest)
 
 .PHONY: retest-debug
 retest-debug:
-	$(call test,vpp,vpp_debug,retest)
+	$(call test,vpp_debug,retest)
 
 .PHONY: retest-all
 retest-all:
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp,vpp,retest)
+	$(call test,vpp,retest)
 
 .PHONY: retest-all-debug
 retest-all-debug:
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp,vpp_debug,retest)
+	$(call test,vpp_debug,retest)
 
 .PHONY: test-start-vpp-in-gdb
 test-start-vpp-in-gdb:
-	$(call test,vpp,vpp,start-gdb)
+	$(call test,vpp,start-gdb)
 
 .PHONY: test-start-vpp-debug-in-gdb
 test-start-vpp-debug-in-gdb:
-	$(call test,vpp,vpp_debug,start-gdb)
+	$(call test,vpp_debug,start-gdb)
 
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run