diff options
| author |   charan makkina <charan795m@gmail.com> | 2018-11-16 16:44:51 +0530 |
|---|---|---|
| committer |   yalei wang <wylandrea@gmail.com> | 2018-11-17 07:14:40 +0000 |
| commit | 3359217b31c63d8d93c7ab33c9a7964179a78d07 (patch) | |
| tree | 21ade744678e387ae0e618ce98452dbdd4351d90 | |
| parent | cfee5312f82e6f04f1c5d5155b8128dd91865bc6 (diff) | |
Fix: Rename libnstack.so to liblwip_dpdk.so
Change-Id: I8c800908189b5741a0b8c35a5f5acdeb672827ae
Signed-off-by: charan makkina <charan795m@gmail.com>
| -rw-r--r-- | demo/nginx_proxy/demo-1/module_config.json | 2 | ||||
| -rw-r--r-- | demo/nginx_proxy/demo-2/module_config.json | 2 | ||||
| -rw-r--r-- | stacks/lwip_stack/app_conf/module_config.json | 2 | ||||
| -rw-r--r-- | stacks/lwip_stack/release_tar.sh | 4 | ||||
| -rw-r--r-- | stacks/lwip_stack/src/sbr/CMakeLists.txt | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/demo/nginx_proxy/demo-1/module_config.json b/demo/nginx_proxy/demo-1/module_config.json index 93ef5f2..5861153 100644 --- a/demo/nginx_proxy/demo-1/module_config.json +++ b/demo/nginx_proxy/demo-1/module_config.json @@ -15,7 +15,7 @@ { "stack_name": "lwip", "function_name": "nstack_stack_register", - "libname": "libnstack.so", + "libname": "liblwip_dpdk.so", "loadtype": "dynmic", "deploytype": "3", "maxfd": "1024", diff --git a/demo/nginx_proxy/demo-2/module_config.json b/demo/nginx_proxy/demo-2/module_config.json index 93ef5f2..5861153 100644 --- a/demo/nginx_proxy/demo-2/module_config.json +++ b/demo/nginx_proxy/demo-2/module_config.json @@ -15,7 +15,7 @@ { "stack_name": "lwip", "function_name": "nstack_stack_register", - "libname": "libnstack.so", + "libname": "liblwip_dpdk.so", "loadtype": "dynmic", "deploytype": "3", "maxfd": "1024", diff --git a/stacks/lwip_stack/app_conf/module_config.json b/stacks/lwip_stack/app_conf/module_config.json index f1b3458..6a2f5fb 100644 --- a/stacks/lwip_stack/app_conf/module_config.json +++ b/stacks/lwip_stack/app_conf/module_config.json @@ -15,7 +15,7 @@ { "stack_name": "lwip", "function_name": "nstack_stack_register", - "libname": "libnstack.so", + "libname": "liblwip_dpdk.so", "loadtype": "dynmic", "deploytype": "3", "maxfd": "1024", diff --git a/stacks/lwip_stack/release_tar.sh b/stacks/lwip_stack/release_tar.sh index 6c2928f..d3cfa68 100644 --- a/stacks/lwip_stack/release_tar.sh +++ b/stacks/lwip_stack/release_tar.sh @@ -29,7 +29,7 @@ if [ -f "./nStackTools.tar.gz" ]; then fi mkdir ./nStackServer/lib64 -cp ./release/lib64/libnstack.so ./release/lib64/libnStackAPI.so ./release/lib64/libnstackcmd.so ./release/lib64/libsecurec.so ./nStackServer/lib64 +cp ./release/lib64/liblwip_dpdk.so ./release/lib64/libnStackAPI.so ./release/lib64/libnstackcmd.so ./release/lib64/libsecurec.so ./nStackServer/lib64 mkdir ./nStackServer/bin cp ./release/bin/nStackCtrl ./release/bin/nStackMain ./release/bin/nStackMaster ./release/bin/set_permission.sh ./nStackServer/bin mkdir ./nStackServer/conf @@ -47,7 +47,7 @@ dos2unix ./nStackServer/*.sh find ./nStackServer -type f | grep -E "*.sh|*.py" | xargs chmod +x mkdir ./nStackClient/lib64 -cp ./release/lib64/libnstack.so ./release/lib64/libnStackAPI.so ./release/lib64/libsecurec.so ./nStackClient/lib64 +cp ./release/lib64/liblwip_dpdk.so ./release/lib64/libnStackAPI.so ./release/lib64/libsecurec.so ./nStackClient/lib64 mkdir ./nStackClient/include cp ./release/include/nstack_custom_api.h ./nStackClient/include diff --git a/stacks/lwip_stack/src/sbr/CMakeLists.txt b/stacks/lwip_stack/src/sbr/CMakeLists.txt index 42ab4a4..f324e5f 100644 --- a/stacks/lwip_stack/src/sbr/CMakeLists.txt +++ b/stacks/lwip_stack/src/sbr/CMakeLists.txt @@ -21,9 +21,9 @@ endif() FILE(GLOB SBR *.c) -ADD_LIBRARY(nstack SHARED ${SBR}) -TARGET_LINK_LIBRARIES(nstack -Wl,--whole-archive socket -Wl,--no-whole-archive dmm_api nStackMaintain) -ADD_DEPENDENCIES(nstack socket DPDK) +ADD_LIBRARY(lwip_dpdk SHARED ${SBR}) +TARGET_LINK_LIBRARIES(lwip_dpdk -Wl,--whole-archive socket -Wl,--no-whole-archive dmm_api nStackMaintain) +ADD_DEPENDENCIES(lwip_dpdk socket DPDK) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_LIST_DIR}/../include ${PAL_H_DIRECTORIES} |