diff --git a/LICENSE b/LICENSE index ff0812f..dd5d5a7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,8 @@ -Valid-License-Identifier: GPL-2.0 +Copyright (c) 2023 Huawei Device Co., Ltd. All rights reserved. + +The newip subdirectories is licensed under GPL-2.0+. + +a) Valid-License-Identifier: GPL-2.0 Valid-License-Identifier: GPL-2.0-only Valid-License-Identifier: GPL-2.0+ Valid-License-Identifier: GPL-2.0-or-later diff --git a/OAT.xml b/OAT.xml index a5956a1..9078e6d 100644 --- a/OAT.xml +++ b/OAT.xml @@ -57,27 +57,21 @@ Note:If the text contains special characters, please escape them according to th - - - - - - - - - - - - + + + - - - - - - + + + + + + + + + diff --git a/newip/apply_newip.sh b/newip/apply_newip.sh index 5cd3732..a81ced7 100644 --- a/newip/apply_newip.sh +++ b/newip/apply_newip.sh @@ -16,22 +16,20 @@ function main() 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 ./ + ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/linux $NEWIP_SOURCE_ROOT/src/linux-5.10/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 ./ + ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/net/netns $NEWIP_SOURCE_ROOT/src/linux-5.10/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 ./ + ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/net $NEWIP_SOURCE_ROOT/src/linux-5.10/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 ./ + ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/include/uapi/linux $NEWIP_SOURCE_ROOT/src/linux-5.10/include/uapi/linux)/*.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)/* ./ + ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/net/newip $NEWIP_SOURCE_ROOT/src/linux-5.10/net/newip)/* ./ ln -s -f $(realpath --relative-to=$KERNEL_BUILD_ROOT/net/newip $NEWIP_SOURCE_ROOT/src/common)/* ./ 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 diff --git a/newip/src/linux-5.10/drivers/net/bt/Makefile b/newip/src/linux-5.10/drivers/net/bt/Makefile index 74ae415..c69bd34 100644 --- a/newip/src/linux-5.10/drivers/net/bt/Makefile +++ b/newip/src/linux-5.10/drivers/net/bt/Makefile @@ -1,3 +1,3 @@ # enable btdev: -# kernel/linux/linux-5.10/drivers/net/Makefile add obj-y += bt/ +# kernel/linux/linux-5.10/drivers/net/Makefile add obj-$(CONFIG_NEWIP) += bt/ obj-y += btdev.o