From 2f74bd7bbf132db4aaab3636dfe1d2de09dd3345 Mon Sep 17 00:00:00 2001
From: mucor <mucorwang@gmail.com>
Date: Wed, 8 Feb 2023 09:55:40 +0800
Subject: [PATCH] fix: use relative path in apply_newip.sh close: #I6DLYR

Signed-off-by: mucor <mucorwang@gmail.com>
---
 apply_newip.sh | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/apply_newip.sh b/apply_newip.sh
index febf35c..f8de27d 100755
--- a/apply_newip.sh
+++ b/apply_newip.sh
@@ -13,22 +13,30 @@ NEWIP_SOURCE_ROOT=$OHOS_SOURCE_ROOT/kernel/common_modules/newip
 
 function main()
 {
-	cd $KERNEL_BUILD_ROOT
-
-	ln -s -f $NEWIP_SOURCE_ROOT/src/linux/include/linux/*.h            $KERNEL_BUILD_ROOT/include/linux/
-	ln -s -f $NEWIP_SOURCE_ROOT/src/linux/include/net/netns/*.h        $KERNEL_BUILD_ROOT/include/net/netns/
-	ln -s -f $NEWIP_SOURCE_ROOT/src/linux/include/net/*.h              $KERNEL_BUILD_ROOT/include/net/
-	ln -s -f $NEWIP_SOURCE_ROOT/src/linux/include/uapi/linux/*.h       $KERNEL_BUILD_ROOT/include/uapi/linux/
-	ln -s -f $NEWIP_SOURCE_ROOT/src/linux/include/trace/hooks/*.h      $KERNEL_BUILD_ROOT/include/trace/hooks/
-	
-	if [ ! -d " $KERNEL_BUILD_ROOT/net/newip" ]; then
-		mkdir $KERNEL_BUILD_ROOT/net/newip
-	fi
-	ln -s -f $NEWIP_SOURCE_ROOT/src/linux/net/newip/*                  $KERNEL_BUILD_ROOT/net/newip/
-	ln -s -f $NEWIP_SOURCE_ROOT/src/common/*                           $KERNEL_BUILD_ROOT/net/newip/
-	ln -s -f $NEWIP_SOURCE_ROOT/src/common/nip_addr.h                  $KERNEL_BUILD_ROOT/include/uapi/linux/nip_addr.h
-	
-	cd -
+    pushd .
+
+    cd $KERNEL_BUILD_ROOT/include/linux/
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/linux       $NEWIP_SOURCE_ROOT/src/linux/include/linux)/*.h ./
+    cd $KERNEL_BUILD_ROOT/include/net/netns
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/net/netns   $NEWIP_SOURCE_ROOT/src/linux/include/net/netns)/*.h ./
+    cd $KERNEL_BUILD_ROOT/include/net
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/net         $NEWIP_SOURCE_ROOT/src/linux/include/net)/*.h ./
+    cd $KERNEL_BUILD_ROOT/include/uapi/linux
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/uapi/linux  $NEWIP_SOURCE_ROOT/src/linux/include/uapi/linux)/*.h ./
+    cd $KERNEL_BUILD_ROOT/include/trace/hooks
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/trace/hooks $NEWIP_SOURCE_ROOT/src/linux/include/trace/hooks)/*.h ./
+
+    if [ ! -d " $KERNEL_BUILD_ROOT/net/newip" ]; then
+        mkdir $KERNEL_BUILD_ROOT/net/newip
+    fi
+
+    cd $KERNEL_BUILD_ROOT/net/newip/
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/net/newip   $NEWIP_SOURCE_ROOT/src/linux/net/newip)/*.h ./
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/net/newip   $NEWIP_SOURCE_ROOT/src/common)/*.h ./
+    cd $KERNEL_BUILD_ROOT/include/uapi/linux
+    ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/uapi/linux   $NEWIP_SOURCE_ROOT/src/common)/nip_addr.h nip_addr.h
+
+    popd
 }
 
 main
-- 
Gitee