diff --git a/License/LICENSE b/License/LICENSE index cefc2d2ab245d76fe75ccfa23d5b6fe3693a83c1..f74a5d48523466f0ea5dcc92e40ab109f7514ffa 100644 --- a/License/LICENSE +++ b/License/LICENSE @@ -1,21 +1,22 @@ - 木兰宽松许可证, 第1版 + 木兰宽松许可证, 第2版 - 木兰宽松许可证, 第1版 - 2019年8月 http://license.coscl.org.cn/MulanPSL + 木兰宽松许可证, 第2版 + 2020年1月 http://license.coscl.org.cn/MulanPSL22 - 您对“软件”的复制、使用、修改及分发受木兰宽松许可证,第1版(“本许可证”)的如下条款的约束: + + 您对“软件”的复制、使用、修改及分发受木兰宽松许可证,第2版(“本许可证”)的如下条款的约束: 0. 定义 “软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 + “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + “贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 “法人实体”是指提交贡献的机构及其“关联实体”。 - “关联实体”是指,对“本许可证”下的一方而言,控制、受控制或与其共同受控制的机构,此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 - - “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + “关联实体”是指,对“本许可证”下的行为方而言,控制、受控制或与其共同受控制的机构,此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 1. 授予版权许可 @@ -23,7 +24,7 @@ 2. 授予专利许可 - 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的(根据本条规定撤销除外)专利许可,供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求,不包括仅因您或他人修改“贡献”或其他结合而将必然会侵犯到的专利权利要求。如您或您的“关联实体”直接或间接地(包括通过代理、专利被许可人或受让人),就“软件”或其中的“贡献”对任何人发起专利侵权诉讼(包括反诉或交叉诉讼)或其他专利维权行动,指控其侵犯专利权,则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的(根据本条规定撤销除外)专利许可,供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求,不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地,就“软件”或其中的“贡献”对任何人发起专利侵权诉讼(包括反诉或交叉诉讼)或其他专利维权行动,指控其侵犯专利权,则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 3. 无商标许可 @@ -35,13 +36,16 @@ 5. 免责声明与责任限制 - “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下,“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任,不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。 + “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下,“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任,不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。 - 条款结束。 + 6. 语言 + “本许可证”以中英文双语表述,中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致,以中文版为准。 - 如何将木兰宽松许可证,第1版,应用到您的软件 + 条款结束 - 如果您希望将木兰宽松许可证,第1版,应用到您的新软件,为了方便接收者查阅,建议您完成如下三步: + 如何将木兰宽松许可证,第2版,应用到您的软件 + + 如果您希望将木兰宽松许可证,第2版,应用到您的新软件,为了方便接收者查阅,建议您完成如下三步: 1, 请您补充如下声明中的空白,包括软件名、软件的首次发表年份以及您作为版权人的名字; @@ -49,47 +53,45 @@ 3, 请将如下声明文本放入每个源文件的头部注释中。 - Copyright (c) [2019] [name of copyright holder] - [Software Name] is licensed under the Mulan PSL v1. - You can use this software according to the terms and conditions of the Mulan PSL v1. - You may obtain a copy of Mulan PSL v1 at: - http://license.coscl.org.cn/MulanPSL - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. - See the Mulan PSL v1 for more details. - + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL22 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. - Mulan Permissive Software License,Version 1 - Mulan Permissive Software License,Version 1 (Mulan PSL v1) - August 2019 http://license.coscl.org.cn/MulanPSL + Mulan Permissive Software License,Version 2 - Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v1 (this License) with following terms and conditions: + Mulan Permissive Software License,Version 2 (Mulan PSL v2) + January 2020 http://license.coscl.org.cn/MulanPSL22 + Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions: + 0. Definition - - Software means the program and related documents which are comprised of those Contribution and licensed under this License. - + + Software means the program and related documents which are licensed under this License and comprise all Contribution(s). + + Contribution means the copyrightable work licensed by a particular Contributor under this License. + Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License. - + Legal Entity means the entity making a Contribution and all its Affiliates. - - Affiliates means entities that control, or are controlled by, or are under common control with a party to this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. - - Contribution means the copyrightable work licensed by a particular Contributor under this License. + + Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. 1. Grant of Copyright License Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not. - 2. Grant of Patent License + 2. Grant of Patent License - Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed, excluding of any patent claims solely be infringed by your or others’ modification or other combinations. If you or your Affiliates directly or indirectly (including through an agent, patent licensee or assignee), institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. 3. No Trademark License - No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4. + No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in Section 4. 4. Distribution Restriction @@ -97,25 +99,29 @@ 5. Disclaimer of Warranty and Limitation of Liability - The Software and Contribution in it are provided without warranties of any kind, either express or implied. In no event shall any Contributor or copyright holder be liable to you for any damages, including, but not limited to any direct, or indirect, special or consequential damages arising from your use or inability to use the Software or the Contribution in it, no matter how it’s caused or based on which legal theory, even if advised of the possibility of such damages. + THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - End of the Terms and Conditions + 6. Language - How to apply the Mulan Permissive Software License,Version 1 (Mulan PSL v1) to your software + THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL. - To apply the Mulan PSL v1 to your work, for easy identification by recipients, you are suggested to complete following three steps: + END OF THE TERMS AND CONDITIONS - i. Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; - ii. Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; - iii. Attach the statement to the appropriate annotated syntax at the beginning of each source file. - - Copyright (c) [2019] [name of copyright holder] - [Software Name] is licensed under the Mulan PSL v1. - You can use this software according to the terms and conditions of the Mulan PSL v1. - You may obtain a copy of Mulan PSL v1 at: - http://license.coscl.org.cn/MulanPSL - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. - - See the Mulan PSL v1 for more details. + How to Apply the Mulan Permissive Software License,Version 2 (Mulan PSL v2) to Your Software + + To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps: + + i Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; + + ii Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; + + iii Attach the statement to the appropriate annotated syntax at the beginning of each source file. + + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL22 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. diff --git a/README.md b/README.md index 19cba3f21bfccd6ef0678b5410a2c2ee41ab4d83..1984855542e54f3cdb6ba83f5ee37f78e2b728c1 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ iSulad follows the kernel coding conventions. You can find a detailed introducti ## Licensing -lcr is licensed under the Mulan PSL v1. +lcr is licensed under the Mulan PSL v2. diff --git a/lcr.spec b/lcr.spec index 192d9796c58b5b577d09642322c10964dc0d2138..3a55bb080e1be8aaa3c4c38e5863d5fa2c533e32 100644 --- a/lcr.spec +++ b/lcr.spec @@ -7,7 +7,7 @@ URL: lcr Source: lcr-2.0.tar.gz Summary: Lightweight Container Runtime Group: Applications/System -License: Mulan PSL v1 +License: Mulan PSL v2 BuildRoot: %{_tmppath}/lcr-%{version} BuildRequires: cmake diff --git a/src/buffer.c b/src/buffer.c index acafb0f9ce1056b3fc4f8a43d1232ba47956eddc..039f681f6acd25db8b859e2d54e7a22c5c26b21e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container buffer definition diff --git a/src/buffer.h b/src/buffer.h index 4b7dbc2078b5fe4797aca3504f980c673604c62a..5bf79a60d42d644777a99307b7bf8050104eaa85 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container buffer definition diff --git a/src/conf.c b/src/conf.c index 923486dc6036abbb8b3add57a9e56be2fcd88cb7..cdf0b739acebd6267cc6010360969d8c6ba89587 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container conf function diff --git a/src/conf.h b/src/conf.h index 678e5759df01af1c7d6d2fd81c23d85753b2914b..c649f2f8d2530d203132509702f9c8bb5170d6ef 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container conf function diff --git a/src/constants.h b/src/constants.h index 73b3b1611faf4416c87a8e01a74b04c499dbf78a..6818ce4680d51c8872453089a2f644846c4038f1 100644 --- a/src/constants.h +++ b/src/constants.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide constant definition diff --git a/src/error.c b/src/error.c index 5011146120a5a55b074cffe29350589a07175f97..30c013eda7b4206a0b22899408b6475f37ef834f 100644 --- a/src/error.c +++ b/src/error.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container error definition diff --git a/src/error.h b/src/error.h index 9bad4424496b7b67872e559c33d57fd5d5183d7d..89901a531e74dffa5e407e35175549c19213b3b0 100644 --- a/src/error.h +++ b/src/error.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container error definition diff --git a/src/json/oci_runtime_hooks.c b/src/json/oci_runtime_hooks.c index 1138c165097c1c64275669df1b3e084999539d2d..dcd31492c7aaebe1191cadd1a416a44a518e1c0d 100644 --- a/src/json/oci_runtime_hooks.c +++ b/src/json/oci_runtime_hooks.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: maoweiyong * Create: 2018-11-08 * Description: provide oci runtime hooks functions diff --git a/src/json/oci_runtime_hooks.h b/src/json/oci_runtime_hooks.h index 2e7bb05c7a73abb44c4c69d877fa42152760befe..6b6d39646d41d590a3b4c2dfc2e10ecd3feb8fad 100644 --- a/src/json/oci_runtime_hooks.h +++ b/src/json/oci_runtime_hooks.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: maoweiyong * Create: 2018-11-08 * Description: provide oci runtime hooks functions diff --git a/src/lcr_list.h b/src/lcr_list.h index cf1c5797bf442efec892ba983500e17d4df2f762..c7b5c9bf39648068cbad4453ba62a4175e85e9a0 100644 --- a/src/lcr_list.h +++ b/src/lcr_list.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container lcr list definition diff --git a/src/lcrcontainer.c b/src/lcrcontainer.c index 4386c724738adc65d38eff4318b67b9c88218b29..160d20d6194d878175bd30458817b05cfbc92858 100644 --- a/src/lcrcontainer.c +++ b/src/lcrcontainer.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container definition diff --git a/src/lcrcontainer.h b/src/lcrcontainer.h index f612e03b8a1183f04ea9bfc908e0ef4b6252cf94..673afa41084bc9a1579bf3fc4ff5765a6cf9e133 100644 --- a/src/lcrcontainer.h +++ b/src/lcrcontainer.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container definition diff --git a/src/lcrcontainer_execute.c b/src/lcrcontainer_execute.c index cf000080bf3bd521bdf4e4a5d26218de64890ae6..9ffe712d85cbfe73cc11ea436659e35298cb335c 100644 --- a/src/lcrcontainer_execute.c +++ b/src/lcrcontainer_execute.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container definition diff --git a/src/lcrcontainer_execute.h b/src/lcrcontainer_execute.h index 6443e5cce16777b81d7545f8f4025149787d8afa..8e7738d14f7e55fe0e8f6a8904302c4ec699f85d 100644 --- a/src/lcrcontainer_execute.h +++ b/src/lcrcontainer_execute.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container definition diff --git a/src/lcrcontainer_extend.c b/src/lcrcontainer_extend.c index c8166400a09025c19ed3935af4776ae3ae311ec5..46e9324af54c8c54ad8b6303f9d102fdcec94da7 100644 --- a/src/lcrcontainer_extend.c +++ b/src/lcrcontainer_extend.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container definition diff --git a/src/lcrcontainer_extend.h b/src/lcrcontainer_extend.h index 178bd595bebcbd79837c2398a2124332ffce0918..47ead9dbc1237ae71e340dd27db4d407698b80ee 100644 --- a/src/lcrcontainer_extend.h +++ b/src/lcrcontainer_extend.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container definition diff --git a/src/log.c b/src/log.c index 68d31720c48c4763557ee43d3b74d681bed9bf92..3bfa7363eda48c3ccf1d16b2025087b0031d1800 100644 --- a/src/log.c +++ b/src/log.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * engine licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * engine licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2019-4-08 * Description: provide container log functions diff --git a/src/log.h b/src/log.h index e41c78f719507c9532639f713cd6f2c4140f9a9a..14e0c9a888d3075824c2bce7996f6ef1e83c5dee 100644 --- a/src/log.h +++ b/src/log.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. - * engine licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * engine licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2019-4-08 * Description: provide container log functions diff --git a/src/utils.c b/src/utils.c index 343c7ad2ddd030aa80a9a30100f52db5a85bbdbc..1a607d37160cb2d1c8e7b82317da17282e180778 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container utils functions diff --git a/src/utils.h b/src/utils.h index e00776f1862fdb85d18c04043da9e7638b40a59f..822ca71399bb523898433da21d5e332260351cfa 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. - * lcr licensed under the Mulan PSL v1. - * You can use this software according to the terms and conditions of the Mulan PSL v1. - * You may obtain a copy of Mulan PSL v1 at: - * http://license.coscl.org.cn/MulanPSL + * lcr licensed under the Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR * PURPOSE. - * See the Mulan PSL v1 for more details. + * See the Mulan PSL v2 for more details. * Author: wujing * Create: 2018-11-08 * Description: provide container utils functions diff --git a/tools/static_check b/tools/static_check index 57b1a79c450bf80adec8fbb6faa1f7157e6680d5..641fff25419a28e689d2322bfcc920605d7dc84e 100755 --- a/tools/static_check +++ b/tools/static_check @@ -1,13 +1,13 @@ ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2019. All rights reserved. -# - lcr licensed under the Mulan PSL v1. -# - You can use this software according to the terms and conditions of the Mulan PSL v1. -# - You may obtain a copy of Mulan PSL v1 at: -# - http://license.coscl.org.cn/MulanPSL +# - lcr licensed under the Mulan PSL v2. +# - You can use this software according to the terms and conditions of the Mulan PSL v2. +# - You may obtain a copy of Mulan PSL v2 at: +# - http://license.coscl.org.cn/MulanPSL2 # - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # - PURPOSE. -# - See the Mulan PSL v1 for more details. +# - See the Mulan PSL v2 for more details. ##- @Description: generate cetification ##- @Author: wujing ##- @Create: 2019-04-25 diff --git a/update-version.bash b/update-version.bash index 2e1abca5a19304ec153cf6a128d9f4881c88e8ef..77a6434aad9911548bc44746b2a4e790e2d5856e 100755 --- a/update-version.bash +++ b/update-version.bash @@ -1,13 +1,13 @@ ####################################################################### ##- @Copyright (C) Huawei Technologies., Ltd. 2019. All rights reserved. -# - lcr licensed under the Mulan PSL v1. -# - You can use this software according to the terms and conditions of the Mulan PSL v1. -# - You may obtain a copy of Mulan PSL v1 at: -# - http://license.coscl.org.cn/MulanPSL +# - lcr licensed under the Mulan PSL v2. +# - You can use this software according to the terms and conditions of the Mulan PSL v2. +# - You may obtain a copy of Mulan PSL v2 at: +# - http://license.coscl.org.cn/MulanPSL2 # - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # - PURPOSE. -# - See the Mulan PSL v1 for more details. +# - See the Mulan PSL v2 for more details. ##- @Description: generate cetification ##- @Author: wujing ##- @Create: 2019-04-25