gso: remove the assert if packet is geneve or gre encaped

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 52f4a26..4e886a9 100644 (file)
--- 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
@@ -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) \