Modify related scripts and files according to the directory structure

Signed-off-by: liangbotong <liangbotong@huawei.com>
This commit is contained in:
liangbotong
2023-04-07 11:31:22 +08:00
parent 0452779839
commit cdab0f7f60
4 changed files with 23 additions and 27 deletions
+5 -1
View File
@@ -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
+12 -18
View File
@@ -57,27 +57,21 @@ Note:If the text contains special characters, please escape them according to th
<oatconfig>
<policylist>
<policy name="projectPolicy" desc="New IP protocol stack">
<policyitem type="license" name="GPL" path="newip\src\linux-5.10\.*" desc="linux-5.10 kernel"/>
<policyitem type="license" name="GPL" path="newip\src\common\.*" desc="NewIP common code"/>
<policyitem type="license" name="GPL" path="newip\src\linux\net\newip\nip_checksum.c" desc="NewIP common code (soft link file)"/>
<policyitem type="license" name="GPL" path="newip\src\linux\net\newip\nip_checksum.h" desc="NewIP common code (soft link file)"/>
<policyitem type="license" name="GPL" path="newip\src\linux\net\newip\nip_addr.c" desc="NewIP common code (soft link file)"/>
<policyitem type="license" name="GPL" path="newip\src\linux\net\newip\nip_addr.h" desc="NewIP common code (soft link file)"/>
<policyitem type="license" name="GPL" path="newip\src\linux\net\newip\nip_hdr_decap.c" desc="NewIP common code (soft link file)"/>
<policyitem type="license" name="GPL" path="newip\src\linux\net\newip\nip_hdr_encap.c" desc="NewIP common code (soft link file)"/>
<policyitem type="license" name="GPL" path="newip\src\linux\net\newip\nip_hdr.h" desc="NewIP common code (soft link file)"/>
<policyitem type="license" name="GPL" path="newip\examples\.*" desc="NewIP examples code"/>
<policyitem type="license" name="GPL" path="newip\tools\wireshark_cfg_for_newip.lua" desc="WireShark lua configure for NewIP protocol stack"/>
<policyitem type="copyright" name="Huawei Device Co., Ltd." path="newip\src\.*" desc="huawei copyright"/>
<policyitem type="compatibility" name="GPL" path=".*" rule="may" group="defaultGroup" filefilter="defaultFilter" desc=""/>
<policyitem type="license" name="GPL" path=".*" rule="may" group="defaultGroup" filefilter="defaultFilter" desc=""/>
<policyitem type="copyright" name="Huawei Device Co., Ltd." path=".*" rule="must" group="defaultGroup" filefilter="defaultFilter" desc=""/>
</policy>
</policylist>
<filefilterlist>
<filefilter name="defaultFilter" desc="New IP protocol stack">
<filteritem type="filepath" name="newip\figures\.*" desc="Describes the architecture of the NewIP"/>
<filteritem type="filepath" name="newip\apply_newip.sh" desc="shield"/>
<filteritem type="filepath" name="newip\LICENSE" desc="license file"/>
<filteritem type="filepath" name="newip\README_zh.md" desc="readme file"/>
<filteritem type="filepath" name="newip\README.md" desc="readme file"/>
<filefilter name="defaultFilter" desc="">
<filteritem type="filepath" name="newip\figures\.*" desc=""/>
<filteritem type="filepath" name="newip\apply_newip.sh" desc=""/>
<filteritem type="filepath" name="newip\README_zh.md" desc=""/>
<filteritem type="filepath" name="newip\README.md" desc=""/>
<filteritem type="filepath" name="newip\README.OpenSource" desc=""/>
<filteritem type="filepath" name="LICENSE" desc=""/>
<filteritem type="filepath" name="README_zh.md" desc=""/>
<filteritem type="filepath" name="README.md" desc=""/>
</filefilter>
</filefilterlist>
</oatconfig>
+5 -7
View File
@@ -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
+1 -1
View File
@@ -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