9307ff5a54
This patch updates net/vpp implementation from version VPP 19.01 to
VPP 19.04.
1. Some binary APIs are deprecated in 19.04 and message queue is used
to handle control events:
- vl_api_bind_sock_reply_t_handler by SESSION_CTRL_EVT_BOUND,
- vl_api_unbind_sock_reply_t_handler by SESSION_CTRL_EVT_UNLISTEN_REPLY,
- vl_api_accept_session_t_handler by SESSION_CTRL_EVT_ACCEPTED,
- vl_api_connect_session_reply_t_handler by SESSION_CTRL_EVT_CONNECTED,
- vl_api_disconnect_session_t_handler by SESSION_CTRL_EVT_DISCONNECTED,
- vl_api_reset_session_t_handler by SESSION_CTRL_EVT_RESET
2. Fixes for Fedora 29/30:
- added "-Wno-address-of-packed-member" (DPDK 19.02 fails to compile
with gcc9.1),
- force "-maes" compile flag for gcc9.1 to compile crypto_ia32 and
crypto_ipsecmb plugins (gcc9.1 doesn't do that for -march=silvermont)
- some minor fixes
3. Default path for VPP instalation is changed for test scripts from
/usr/local/src/vpp to /usr/local/src/vpp-19.04 to avoid VPP version
conflict.
Change-Id: I1d20ad7f138f5086ba7fab41d77d86f8139d038e
Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459113
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 8c7f3523f..20814ee8d 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -92,8 +92,8 @@ RPM_DEPENDS += mbedtls-devel
|
|
ifeq ($(OS_ID),fedora)
|
|
RPM_DEPENDS += dnf-utils
|
|
RPM_DEPENDS += subunit subunit-devel
|
|
- RPM_DEPENDS += compat-openssl10-devel
|
|
- RPM_DEPENDS += python2-devel python34-ply
|
|
+ RPM_DEPENDS += openssl-devel
|
|
+ RPM_DEPENDS += python2-devel
|
|
RPM_DEPENDS += python2-virtualenv
|
|
RPM_DEPENDS += cmake
|
|
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
|
|
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
|
|
index a551151bb..b0258017a 100644
|
|
--- a/build/external/packages/dpdk.mk
|
|
+++ b/build/external/packages/dpdk.mk
|
|
@@ -147,7 +147,7 @@ endif
|
|
endif
|
|
endif
|
|
|
|
-DPDK_EXTRA_CFLAGS += -L$(I)/lib -I$(I)/include
|
|
+DPDK_EXTRA_CFLAGS += -L$(I)/lib -I$(I)/include -Wno-address-of-packed-member
|
|
|
|
# assemble DPDK make arguments
|
|
DPDK_MAKE_ARGS := -C $(DPDK_SOURCE) -j $(JOBS) \
|
|
diff --git a/src/plugins/crypto_ia32/CMakeLists.txt b/src/plugins/crypto_ia32/CMakeLists.txt
|
|
index a100cdbb6..92e408098 100644
|
|
--- a/src/plugins/crypto_ia32/CMakeLists.txt
|
|
+++ b/src/plugins/crypto_ia32/CMakeLists.txt
|
|
@@ -22,3 +22,4 @@ add_vpp_plugin(crypto_ia32
|
|
)
|
|
|
|
target_compile_options(crypto_ia32_plugin PRIVATE "-march=silvermont")
|
|
+target_compile_options(crypto_ia32_plugin PRIVATE "-maes")
|
|
diff --git a/src/plugins/crypto_ipsecmb/CMakeLists.txt b/src/plugins/crypto_ipsecmb/CMakeLists.txt
|
|
index 0d08032c0..6a7eb148f 100644
|
|
--- a/src/plugins/crypto_ipsecmb/CMakeLists.txt
|
|
+++ b/src/plugins/crypto_ipsecmb/CMakeLists.txt
|
|
@@ -39,3 +39,4 @@ else()
|
|
endif()
|
|
|
|
target_compile_options(crypto_ipsecmb_plugin PRIVATE "-march=silvermont")
|
|
+target_compile_options(crypto_ipsecmb_plugin PRIVATE "-maes")
|