From e0c272624602f0fa1e195e4540df2c7e081311af Mon Sep 17 00:00:00 2001
From: Yalei Wang <william.wangyalei@huawei.com>
Date: Mon, 17 Sep 2018 11:30:49 +0800
Subject: Fix: update the path of lwip script

Change-Id: I86134524e80b8b60b9858ae27289ceb6eca927d1
Signed-off-by: Yalei Wang <william.wangyalei@huawei.com>
---
 stacks/lwip_stack/CMakeLists.txt               |  2 --
 stacks/lwip_stack/release/script/nstack_var.sh |  2 +-
 stacks/lwip_stack/release/start_nstack.sh      | 11 ++++++-----
 stacks/lwip_stack/release/stop_nstack.sh       |  6 ++++--
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'stacks')

diff --git a/stacks/lwip_stack/CMakeLists.txt b/stacks/lwip_stack/CMakeLists.txt
index 9f64af9..0498824 100644
--- a/stacks/lwip_stack/CMakeLists.txt
+++ b/stacks/lwip_stack/CMakeLists.txt
@@ -61,8 +61,6 @@ execute_process(
     COMMAND cp -rf ${CMAKE_CURRENT_LIST_DIR}/../../release/include	${CMAKE_CURRENT_LIST_DIR}/src/
     COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../release/lib64/libnStackAPI.so	${CMAKE_CURRENT_LIST_DIR}/release/lib64/
     COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../release/lib64/libdmm_api.so	${CMAKE_CURRENT_LIST_DIR}/release/lib64/
-    COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../build/libnStackMaintain.a        ${CMAKE_CURRENT_LIST_DIR}/release/lib64/
-	COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../build/libsocket.a	${CMAKE_CURRENT_LIST_DIR}/build/
     COMMAND echo "stacklwip prepare ok"
 )
 execute_process(
diff --git a/stacks/lwip_stack/release/script/nstack_var.sh b/stacks/lwip_stack/release/script/nstack_var.sh
index 15ef2f0..4c5c6f6 100644
--- a/stacks/lwip_stack/release/script/nstack_var.sh
+++ b/stacks/lwip_stack/release/script/nstack_var.sh
@@ -26,7 +26,7 @@ DPDK_FILE_NAME=nstack_dpdk.log
 
 export VM_ID=agent-node-x
 
-export DPDK_INSTALL_PATH="/root/dpdk/dpdk-18.02"
+export DPDK_INSTALL_PATH="/tmp/dpdk/dpdk-18.02/"
 export DPDK_LIB_PATH=${DPDK_INSTALL_PATH}/x86_64-native-linuxapp-gcc/lib
 export DPDK_TOOL_DIR=${DPDK_INSTALL_PATH}/usertools
 export DPDK_MOD_PATH=${DPDK_INSTALL_PATH}/x86_64-native-linuxapp-gcc/kmod
diff --git a/stacks/lwip_stack/release/start_nstack.sh b/stacks/lwip_stack/release/start_nstack.sh
index c005f25..db0c084 100644
--- a/stacks/lwip_stack/release/start_nstack.sh
+++ b/stacks/lwip_stack/release/start_nstack.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
-. ./script/nstack_var.sh
-. ./script/nstack_fun.sh
 
 script_path=$(cd "$(dirname "$0")"; pwd)
+
+. ${script_path}/script/nstack_var.sh
+. ${script_path}/script/nstack_fun.sh
+
 config_name=${script_path}/script/nstack_var.sh
 if [ ! -e $config_name ]; then
     log $LINENO "nstack_var.sh not exit, plz check!"
@@ -59,7 +61,7 @@ if [ -f "lockfile" ]; then
     rm lockfile
 fi
 
-. ./script/nstack_var.sh
+. ${script_path}/script/nstack_var.sh
 
 
 ########################################################
@@ -115,8 +117,7 @@ install_config
 core_mask=1
 START_TYPE="primary"
 log $LINENO "./script/run_nstack_main.sh ${core_mask} $HUGE_DIR $MEM_SIZE $START_TYPE"
-cd script
-./run_nstack_main.sh $HUGE_DIR $MEM_SIZE
+${script_path}/script/run_nstack_main.sh $HUGE_DIR $MEM_SIZE
 
 print_pid=$(ps -ux | grep nStackMain | awk '{print $2}' | awk 'NR == 2')
 echo "nStackMain PID:$print_pid"
diff --git a/stacks/lwip_stack/release/stop_nstack.sh b/stacks/lwip_stack/release/stop_nstack.sh
index 9b9fe94..48d1af7 100644
--- a/stacks/lwip_stack/release/stop_nstack.sh
+++ b/stacks/lwip_stack/release/stop_nstack.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
-. ./script/nstack_var.sh
-. ./script/nstack_fun.sh
 
 script_path=$(cd "$(dirname "$0")"; pwd)
+
+. ${script_path}/script/nstack_var.sh
+. ${script_path}/script/nstack_fun.sh
+
 config_name=${script_path}/script/nstack_var.sh
 if [ ! -e $config_name ]; then
     log $LINENO "$config_name not exit, plz pay attention and add back!,or it has resourcce leak."
-- 
cgit 1.2.3-korg