From 7c82901c92fe7ec0216d0cb26b6bd5c393ae5e3c Mon Sep 17 00:00:00 2001
From: yangyanjun <ic-include@163.com>
Date: Fri, 23 Sep 2022 11:05:30 +0800
Subject: [PATCH] =?UTF-8?q?license=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=EF=BC=8COAT=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8COAT=E6=89=AB=E6=8F=8F=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yangyanjun <yangyanjun@huawei.com>
---
 LICENSE                                    |  7 ++++-
 OAT.xml                                    | 35 +++++++++-------------
 code/linux/include/trace/hooks/nip_hooks.h |  2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/LICENSE b/LICENSE
index 4a7fb36..04199a4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,12 @@
 NewIP - New IP Stack
 Copyright (c) 2022 Huawei Device Co., Ltd. All rights reserved.
 
-you can use it under the terms of the GPL V2 and the BSD2 license.
+NewIP is dual licensed: you can use it under the terms of the GPL V2 and the BSD2 license.
+
+The code/linux/ subdirectorie is licensed under the GPL V2 License.
+The code/ommon/ subdirectorie is licensed under 2-Clause BSD License.
+The examples/ subdirectorie is licensed under 2-Clause BSD License.
+
 a) GNU General Public License version 2, (https://opensource.org/licenses/GPL-2.0)
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
diff --git a/OAT.xml b/OAT.xml
index 256ed43..0ed7809 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -55,29 +55,22 @@ Note:If the text contains special characters, please escape them according to th
 -->
 <configuration>
 	<oatconfig>
-		<licensefile>COPYING</licensefile>
 		<policylist>
 			<policy name="projectPolicy" desc="">
-				<policyitem type="compatibility" name="GPL-1.0+"                 path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="GPL-2.0+"                 path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="SPDX:LGPL-2.1"            path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="SPDX:GPL-2.0+"            path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="GPLStyleLicense"          path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="Linux-OpenIB"             path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="SPDX:Zlib"                path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="SPDX:X11"                 path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="Unicode-TOU"              path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="HPND-sell-variant"        path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="zlib-acknowledgement"     path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="Linux-syscall-note"       path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="LGPLStyleLicense"         path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="MPL-1.1"                  path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="GCC-exception-2.0"        path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="GPL-COMPATIBLE-ID"        path=".*" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="BSD-2-Clause"             path="code/common/.*"      desc="NewIP common code"/>
-				<policyitem type="compatibility" name="Linux-syscall-note"       path="examples/nip_uapi.h" desc="linux kernel license"/>
-				<policyitem type="compatibility" name="BSD-2-Clause"             path="examples/.*"         desc="NewIP examples code"/>
-				<policyitem type="copyright"     name="Huawei Device Co., Ltd."  path="code/.*"             desc="huawei copyright"/>
+				<policyitem type="license" name="GPL" path="code\linux\.*"                        desc="linux kernel"/>
+				<policyitem type="license" name="BSD" path="code\common\.*"                       desc="NewIP common code"/>
+				<policyitem type="license" name="BSD" path="code\linux\net\newip\nip_checksum.c"  desc="NewIP common code (soft link file)"/>
+				<policyitem type="license" name="BSD" path="code\linux\net\newip\nip_checksum.h"  desc="NewIP common code (soft link file)"/>
+				<policyitem type="license" name="BSD" path="code\linux\net\newip\nip_addr.c"      desc="NewIP common code (soft link file)"/>
+				<policyitem type="license" name="BSD" path="code\linux\net\newip\nip_addr.h"      desc="NewIP common code (soft link file)"/>
+				<policyitem type="license" name="BSD" path="code\linux\net\newip\nip_hdr_decap.c" desc="NewIP common code (soft link file)"/>
+				<policyitem type="license" name="BSD" path="code\linux\net\newip\nip_hdr_encap.c" desc="NewIP common code (soft link file)"/>
+				<policyitem type="license" name="BSD" path="code\linux\net\newip\nip_hdr.h"       desc="NewIP common code (soft link file)"/>
+				<policyitem type="license" name="GPL" path="examples\nip_uapi.h"                  desc="GPL-2.0 WITH Linux-syscall-note"/>
+				<policyitem type="license" name="BSD" path="examples\.*"                          desc="NewIP examples code"/>
+				<policyitem type="copyright" name="Huawei Device Co., Ltd." path="code/.*"        desc="huawei copyright"/>
+				<policyitem type="license" name="GPL" path="LICENSE"                              desc="GPL and BSD dual license"/>
+				<policyitem type="license" name="BSD" path="LICENSE"                              desc="GPL and BSD dual license"/>
 			</policy>
 		</policylist>
 		<filefilterlist>
diff --git a/code/linux/include/trace/hooks/nip_hooks.h b/code/linux/include/trace/hooks/nip_hooks.h
index 9d8c14d..eea8c11 100644
--- a/code/linux/include/trace/hooks/nip_hooks.h
+++ b/code/linux/include/trace/hooks/nip_hooks.h
@@ -2,7 +2,7 @@
 /*
  * NewIP Hooks
  *
- * Copyright (c) 2022, Huawei Tech. Co., Ltd.
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
  */
 #ifdef CONFIG_NEWIP_HOOKS
 
-- 
Gitee