Merge branch 'master' to rx_features phase 0.5

Signed-off-by: imarom <imarom@cisco.com>

1 files changed, 35 insertions, 5 deletions

diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index 7477065e..7fd73f2e 100755
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -31,6 +31,16 @@ USERS_ALLOWED_TO_RELEASE = ['hhaim']
 # utility for group source code 
 ###################################
 
+orig_system = os.system
+
+def verify_system(cmd):
+    ret = orig_system(cmd)
+    if ret:
+        raise Exception('Return code %s on command: system("%s")' % (ret, cmd))
+
+os.system = verify_system
+
+
 class SrcGroup:
     ' group of source by directory '
 
@@ -317,6 +327,21 @@ dpdk_src = SrcGroup(dir='src/dpdk/',
                  'drivers/net/ixgbe/ixgbe_pf.c',
                  'drivers/net/ixgbe/ixgbe_rxtx.c',
                  'drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c',
+
+                 'drivers/net/mlx5/mlx5_mr.c',
+                 'drivers/net/mlx5/mlx5_ethdev.c',
+                 'drivers/net/mlx5/mlx5_mac.c',
+                 'drivers/net/mlx5/mlx5_rxmode.c',
+                 'drivers/net/mlx5/mlx5_rxtx.c',
+                 'drivers/net/mlx5/mlx5_stats.c',
+                 'drivers/net/mlx5/mlx5_txq.c',
+                 'drivers/net/mlx5/mlx5.c',
+                 'drivers/net/mlx5/mlx5_fdir.c',
+                 'drivers/net/mlx5/mlx5_rss.c',
+                 'drivers/net/mlx5/mlx5_rxq.c',
+                 'drivers/net/mlx5/mlx5_trigger.c',
+                 'drivers/net/mlx5/mlx5_vlan.c',
+
                  'drivers/net/i40e/base/i40e_adminq.c',
                  'drivers/net/i40e/base/i40e_common.c',
                  'drivers/net/i40e/base/i40e_dcb.c',
@@ -520,6 +545,8 @@ includes_path =''' ../src/pal/linux_dpdk/
 dpdk_includes_path =''' ../src/ 
                         ../src/pal/linux_dpdk/
                         ../src/pal/linux_dpdk/dpdk
+                        ../external_libs/ibverbs/include/
+
 ../src/dpdk/drivers/
 ../src/dpdk/drivers/net/
 ../src/dpdk/drivers/net/af_packet/
@@ -695,6 +722,8 @@ class build_option:
 
     def get_c_flags (self):
         flags = self.get_common_flags()
+        if  self.isRelease () :
+            flags += ['-DNDEBUG'];
 
         # for C no special flags yet
         return (flags)
@@ -724,6 +753,9 @@ def build_prog (bld, build_obj):
     zmq_lib_path='external_libs/zmq/'
     bld.read_shlib( name='zmq' , paths=[top+zmq_lib_path] )
 
+    ibverbs_lib_path='external_libs/ibverbs/'
+    bld.read_shlib( name='ibverbs' , paths=[top+ibverbs_lib_path] )
+
     #rte_libs =[
     #         'dpdk'];
 
@@ -735,7 +767,6 @@ def build_prog (bld, build_obj):
     # add electric fence only for debug image  
     debug_file_list='';
     if not build_obj.isRelease ():
-        #debug 
         debug_file_list +=ef_src.file_list(top)
 
 
@@ -753,7 +784,7 @@ def build_prog (bld, build_obj):
                 cxxflags =(build_obj.get_cxx_flags()+['-std=gnu++11',]),
                 linkflags = build_obj.get_link_flags() ,
                 lib=['pthread','dl', 'z'],
-                use =[build_obj.get_dpdk_target(),'zmq'],
+                use =[build_obj.get_dpdk_target(),'zmq','ibverbs'],
                 source = bp.file_list(top) + debug_file_list,
                 target = build_obj.get_target())
 
@@ -885,12 +916,11 @@ files_list=[
             'trex-cfg',
             'bp-sim-64',
             'bp-sim-64-debug',
-            't-rex-debug-gdb',
+            't-rex-64-debug-gdb',
             'stl-sim',
             'find_python.sh',
             'run_regression',
             'run_functional_tests',
-            'release_notes.pdf',
             'dpdk_nic_bind.py',
             'dpdk_setup_ports.py',
             'doc_process.py',
@@ -900,7 +930,7 @@ files_list=[
             'daemon_server'
             ];
 
-files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib','stl','api','exp']
+files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib','stl','exp','dumy_libs']
 
 
 class Env(object):