diff --git a/apply_newip.sh b/apply_newip.sh index febf35c5703d77b532989c72985aa551a9447de3..f8de27dccb358c6871d61ead74d8eed3818f6a61 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