ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
d23f3a85f7
Spdk/test/common/config/patch/vpp/fedora29-fix.patch

21 lines
619 B
Diff
Raw Normal View History

net/vpp: fix vpp 19.01 installation on fedora 29/30 Change-Id: I953add8d0c01317be041b83eddb4b62689badbf0 Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460940 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2019-07-09 08:25:53 +00:00
diff --git a/Makefile b/Makefile
net/vpp: move to VPP 19.04 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>
2019-06-19 14:14:50 +00:00
index 8c7f3523f..b6a79529c 100644
net/vpp: fix vpp 19.01 installation on fedora 29/30 Change-Id: I953add8d0c01317be041b83eddb4b62689badbf0 Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460940 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2019-07-09 08:25:53 +00:00
--- a/Makefile
+++ b/Makefile
net/vpp: move to VPP 19.04 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>
2019-06-19 14:14:50 +00:00
@@ -90,10 +90,12 @@ RPM_DEPENDS += libuuid-devel
RPM_DEPENDS += mbedtls-devel
net/vpp: fix vpp 19.01 installation on fedora 29/30 Change-Id: I953add8d0c01317be041b83eddb4b62689badbf0 Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460940 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2019-07-09 08:25:53 +00:00
ifeq ($(OS_ID),fedora)
- RPM_DEPENDS += dnf-utils
+ ifeq ("$(wildcard /usr/bin/package-cleanup)","")
+ RPM_DEPENDS += dnf-utils
+ endif
RPM_DEPENDS += subunit subunit-devel
- RPM_DEPENDS += compat-openssl10-devel
net/vpp: move to VPP 19.04 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>
2019-06-19 14:14:50 +00:00
- RPM_DEPENDS += python2-devel python34-ply
net/vpp: fix vpp 19.01 installation on fedora 29/30 Change-Id: I953add8d0c01317be041b83eddb4b62689badbf0 Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460940 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2019-07-09 08:25:53 +00:00
+ RPM_DEPENDS += openssl-devel
net/vpp: move to VPP 19.04 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>
2019-06-19 14:14:50 +00:00
+ RPM_DEPENDS += python2-devel
net/vpp: fix vpp 19.01 installation on fedora 29/30 Change-Id: I953add8d0c01317be041b83eddb4b62689badbf0 Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com> Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460940 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
2019-07-09 08:25:53 +00:00
RPM_DEPENDS += python2-virtualenv
net/vpp: move to VPP 19.04 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>
2019-06-19 14:14:50 +00:00
RPM_DEPENDS += cmake
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
Reference in New Issue Copy Permalink