From 1270885d1e1453aa44bf1030b53bf484ef97d8ba Mon Sep 17 00:00:00 2001 From: GitHuaKuang Date: Mon, 1 Feb 2021 10:15:19 -0500 Subject: [PATCH] Daos 6338 DAOS: Change DAOS license text #6 (#4475) Updated misc files. Signed-off-by: Hua Kuang --- README.md | 4 +- doc/man/man8/daos.8 | 19 +- src/cart/SConscript | 21 +- src/cart/swim/SConscript | 21 +- .../java/dev/checkstyle/checkstyle.license | 21 +- .../services/org.apache.hadoop.fs.FileSystem | 23 +- .../src/test/resources/contract/daos.xml | 16 +- src/client/java/pom.xml | 11 +- src/control/lib/ipmctl/LICENSE | 201 ------------------ src/control/lib/spdk/src/nvme_control.c | 21 +- .../lib/spdk/src/nvme_control_common.c | 19 +- src/gurt/SConscript | 21 +- src/gurt/examples/SConscript | 20 +- src/gurt/tests/SConscript | 20 +- src/include/daos_version.h.in | 12 +- src/proto/Makefile | 19 +- src/tests/ftest/cart/utest/SConscript | 21 +- src/tests/ftest/cart/utest/test_linkage.cpp | 21 +- src/tests/suite/io_conf/daos_io_conf_1 | 21 +- src/tests/suite/io_conf/daos_io_conf_2 | 21 +- src/tests/suite/io_conf/daos_io_conf_3 | 21 +- src/tests/suite/io_conf/daos_io_conf_4 | 21 +- src/tests/suite/io_conf/daos_io_conf_5 | 21 +- src/utils/crt_launch/SConscript | 21 +- src/utils/ctl/SConscript | 21 +- src/utils/daos_metrics/SConscript | 18 +- src/utils/daos_metrics/daos_metrics.c | 19 +- src/utils/self_test/SConscript | 21 +- 28 files changed, 47 insertions(+), 669 deletions(-) delete mode 100644 src/control/lib/ipmctl/LICENSE diff --git a/README.md b/README.md index 01baf06de6b..28e76909b9e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # DAOS -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](./LICENSE) +[![License](https://img.shields.io/badge/License-BSD--2--Clause--Patent-blue.svg)](./LICENSE) [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/3015.svg)](https://scan.coverity.com/projects/daos-stack-daos) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4163f52ec65e4ba8991208288a9a15a6)](https://www.codacy.com/app/johann.lombardi/daos?utm_source=github.com&utm_medium=referral&utm_content=daos-stack/daos&utm_campaign=Badge_Grade) @@ -19,7 +19,7 @@ and elastic storage to optimize performance and cost. ## License -DAOS is licensed under the Apache License Version 2.0. +DAOS is licensed under the BSD-2-Clause Plus Patent License. Please see the [LICENSE](./LICENSE) & [NOTICE](./NOTICE) files for more information. diff --git a/doc/man/man8/daos.8 b/doc/man/man8/daos.8 index 15e5c2bcdb3..6128717dc8c 100644 --- a/doc/man/man8/daos.8 +++ b/doc/man/man8/daos.8 @@ -1,23 +1,6 @@ .\" (C) Copyright 2015-2021 Intel Corporation. .\" -.\" Licensed under the Apache License, Version 2.0 (the "License"); -.\" you may not use this file except in compliance with the License. -.\" You may obtain a copy of the License at -.\" -.\" http://www.apache.org/licenses/LICENSE-2.0 -.\" -.\" Unless required by applicable law or agreed to in writing, software -.\" distributed under the License is distributed on an "AS IS" BASIS, -.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -.\" See the License for the specific language governing permissions and -.\" limitations under the License. -.\" -.\" GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -.\" The Government's rights to use, modify, reproduce, release, perform, display, -.\" or disclose this software are subject to the terms of the Apache License as -.\" provided in Contract No. B609815. -.\" Any reproduction of computer software, computer software documentation, or -.\" portions thereof marked with this legend must also reproduce the markings. +.\" SPDX-License-Identifier: BSD-2-Clause-Patent .\" .TH daos 8 2019-09-17 "0.0.1" "DAOS Utilities" .SH NAME diff --git a/src/cart/SConscript b/src/cart/SConscript index 440aaec167e..79f7d7ce628 100644 --- a/src/cart/SConscript +++ b/src/cart/SConscript @@ -1,24 +1,7 @@ #!python -# (C) Copyright 2016-2020 Intel Corporation. +# (C) Copyright 2016-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # """Build CaRT components""" diff --git a/src/cart/swim/SConscript b/src/cart/swim/SConscript index 6eaf2239c1b..cc9f3b4f408 100644 --- a/src/cart/swim/SConscript +++ b/src/cart/swim/SConscript @@ -1,24 +1,7 @@ #!python -# (C) Copyright 2018-2020 Intel Corporation. +# (C) Copyright 2018-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # """Build swim src""" diff --git a/src/client/java/dev/checkstyle/checkstyle.license b/src/client/java/dev/checkstyle/checkstyle.license index 9075d3ff507..7562dee4a3b 100644 --- a/src/client/java/dev/checkstyle/checkstyle.license +++ b/src/client/java/dev/checkstyle/checkstyle.license @@ -1,22 +1,5 @@ /* - * (C) Copyright 2018-2020 Intel Corporation. + * (C) Copyright 2018-2021 Intel Corporation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE - * The Government's rights to use, modify, reproduce, release, perform, display, - * or disclose this software are subject to the terms of the Apache License as - * provided in Contract No. B609815. - * Any reproduction of computer software, computer software documentation, or - * portions thereof marked with this legend must also reproduce the markings. + * SPDX-License-Identifier: BSD-2-Clause-Patent */ diff --git a/src/client/java/hadoop-daos/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem b/src/client/java/hadoop-daos/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem index ace6f597a55..dfaf56a5ba8 100644 --- a/src/client/java/hadoop-daos/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem +++ b/src/client/java/hadoop-daos/src/main/resources/META-INF/services/org.apache.hadoop.fs.FileSystem @@ -1,22 +1,5 @@ -# (C) Copyright 2018-2020 Intel Corporation. +# (C) Copyright 2018-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# SPDX-License-Identifier: BSD-2-Clause-Patent # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. B609815. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. - -io.daos.fs.hadoop.DaosFileSystem \ No newline at end of file +io.daos.fs.hadoop.DaosFileSystem diff --git a/src/client/java/hadoop-daos/src/test/resources/contract/daos.xml b/src/client/java/hadoop-daos/src/test/resources/contract/daos.xml index 7f9707430e5..696d3212f90 100644 --- a/src/client/java/hadoop-daos/src/test/resources/contract/daos.xml +++ b/src/client/java/hadoop-daos/src/test/resources/contract/daos.xml @@ -1,21 +1,7 @@ diff --git a/src/client/java/pom.xml b/src/client/java/pom.xml index 68c5666b2df..aca16507ea9 100644 --- a/src/client/java/pom.xml +++ b/src/client/java/pom.xml @@ -1,14 +1,5 @@ - + 4.0.0 diff --git a/src/control/lib/ipmctl/LICENSE b/src/control/lib/ipmctl/LICENSE deleted file mode 100644 index 261eeb9e9f8..00000000000 --- a/src/control/lib/ipmctl/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/src/control/lib/spdk/src/nvme_control.c b/src/control/lib/spdk/src/nvme_control.c index 1bc48417bcc..28a1837c87f 100644 --- a/src/control/lib/spdk/src/nvme_control.c +++ b/src/control/lib/spdk/src/nvme_control.c @@ -1,24 +1,7 @@ /** -* (C) Copyright 2018-2020 Intel Corporation. +* (C) Copyright 2018-2021 Intel Corporation. * -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -* The Government's rights to use, modify, reproduce, release, perform, display, -* or disclose this software are subject to the terms of the Apache License as -* provided in Contract No. 8F-30005. -* Any reproduction of computer software, computer software documentation, or -* portions thereof marked with this legend must also reproduce the markings. +* SPDX-License-Identifier: BSD-2-Clause-Patent */ #include diff --git a/src/control/lib/spdk/src/nvme_control_common.c b/src/control/lib/spdk/src/nvme_control_common.c index 5784a799aa2..2cd99de4c91 100644 --- a/src/control/lib/spdk/src/nvme_control_common.c +++ b/src/control/lib/spdk/src/nvme_control_common.c @@ -1,24 +1,7 @@ /** * (C) Copyright 2019-2021 Intel Corporation. * -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -* The Government's rights to use, modify, reproduce, release, perform, display, -* or disclose this software are subject to the terms of the Apache License as -* provided in Contract No. 8F-30005. -* Any reproduction of computer software, computer software documentation, or -* portions thereof marked with this legend must also reproduce the markings. +* SPDX-License-Identifier: BSD-2-Clause-Patent */ #include diff --git a/src/gurt/SConscript b/src/gurt/SConscript index 105718d753c..34506715d53 100644 --- a/src/gurt/SConscript +++ b/src/gurt/SConscript @@ -1,24 +1,7 @@ #!python -# (C) Copyright 2016-2020 Intel Corporation. +# (C) Copyright 2016-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # """Build libgurt""" diff --git a/src/gurt/examples/SConscript b/src/gurt/examples/SConscript index deaa0f0bbf8..7ebe36aad8a 100644 --- a/src/gurt/examples/SConscript +++ b/src/gurt/examples/SConscript @@ -1,23 +1,7 @@ -# (C) Copyright 2020 Intel Corporation. +# (C) Copyright 2020-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# SPDX-License-Identifier: BSD-2-Clause-Patent # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. """Example code""" import daos_build diff --git a/src/gurt/tests/SConscript b/src/gurt/tests/SConscript index 97efcbb4582..84c5a213ce8 100644 --- a/src/gurt/tests/SConscript +++ b/src/gurt/tests/SConscript @@ -1,23 +1,7 @@ -# (C) Copyright 2020 Intel Corporation. +# (C) Copyright 2020-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# SPDX-License-Identifier: BSD-2-Clause-Patent # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. """Unit tests""" import os diff --git a/src/include/daos_version.h.in b/src/include/daos_version.h.in index 45b1c0538bf..19a90eade84 100644 --- a/src/include/daos_version.h.in +++ b/src/include/daos_version.h.in @@ -1,17 +1,7 @@ /* * (C) Copyright 2016-2021 Intel Corporation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * SPDX-License-Identifier: BSD-2-Clause-Patent */ /** * \file diff --git a/src/proto/Makefile b/src/proto/Makefile index 2695b92b407..927f08860f0 100644 --- a/src/proto/Makefile +++ b/src/proto/Makefile @@ -1,24 +1,7 @@ # # (C) Copyright 2019-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. B609815. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # DAOS_ROOT ?= $(shell git rev-parse --show-toplevel) diff --git a/src/tests/ftest/cart/utest/SConscript b/src/tests/ftest/cart/utest/SConscript index 8184a6fc28f..65d9d513c9f 100644 --- a/src/tests/ftest/cart/utest/SConscript +++ b/src/tests/ftest/cart/utest/SConscript @@ -1,24 +1,7 @@ #!python -# (C) Copyright 2016-2020 Intel Corporation. +# (C) Copyright 2016-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # """Unit tests""" diff --git a/src/tests/ftest/cart/utest/test_linkage.cpp b/src/tests/ftest/cart/utest/test_linkage.cpp index 4c17f1daf92..db461000aa4 100644 --- a/src/tests/ftest/cart/utest/test_linkage.cpp +++ b/src/tests/ftest/cart/utest/test_linkage.cpp @@ -1,24 +1,7 @@ /* - * (C) Copyright 2016-2020 Intel Corporation. + * (C) Copyright 2016-2021 Intel Corporation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE - * The Government's rights to use, modify, reproduce, release, perform, display, - * or disclose this software are subject to the terms of the Apache License as - * provided in Contract No. 8F-30005. - * Any reproduction of computer software, computer software documentation, or - * portions thereof marked with this legend must also reproduce the markings. + * SPDX-License-Identifier: BSD-2-Clause-Patent */ /** * This file is part of CaRT. It tests that header files can be included diff --git a/src/tests/suite/io_conf/daos_io_conf_1 b/src/tests/suite/io_conf/daos_io_conf_1 index a1a5aef0410..78adfd42d8e 100644 --- a/src/tests/suite/io_conf/daos_io_conf_1 +++ b/src/tests/suite/io_conf/daos_io_conf_1 @@ -1,24 +1,7 @@ #/* -# * (C) Copyright 2018-2019 Intel Corporation. +# * (C) Copyright 2018-2021 Intel Corporation. # * -# * Licensed under the Apache License, Version 2.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# * -# * http://www.apache.org/licenses/LICENSE-2.0 -# * -# * Unless required by applicable law or agreed to in writing, software -# * distributed under the License is distributed on an "AS IS" BASIS, -# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# * See the License for the specific language governing permissions and -# * limitations under the License. -# * -# * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# * The Government's rights to use, modify, reproduce, release, perform, display, -# * or disclose this software are subject to the terms of the Apache License as -# * provided in Contract No. B609815. -# * Any reproduction of computer software, computer software documentation, or -# * portions thereof marked with this legend must also reproduce the markings. +# * SPDX-License-Identifier: BSD-2-Clause-Patent # */ #/** # * An example daos EPOCH IO test conf file. diff --git a/src/tests/suite/io_conf/daos_io_conf_2 b/src/tests/suite/io_conf/daos_io_conf_2 index be34f717eda..f912414ab3f 100644 --- a/src/tests/suite/io_conf/daos_io_conf_2 +++ b/src/tests/suite/io_conf/daos_io_conf_2 @@ -1,24 +1,7 @@ #/* -## * (C) Copyright 2018-2019 Intel Corporation. +## * (C) Copyright 2018-2021 Intel Corporation. ## * -## * Licensed under the Apache License, Version 2.0 (the "License"); -## * you may not use this file except in compliance with the License. -## * You may obtain a copy of the License at -## * -## * http://www.apache.org/licenses/LICENSE-2.0 -## * -## * Unless required by applicable law or agreed to in writing, software -## * distributed under the License is distributed on an "AS IS" BASIS, -## * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## * See the License for the specific language governing permissions and -## * limitations under the License. -## * -## * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -## * The Government's rights to use, modify, reproduce, release, perform, display, -## * or disclose this software are subject to the terms of the Apache License as -## * provided in Contract No. B609815. -## * Any reproduction of computer software, computer software documentation, or -## * portions thereof marked with this legend must also reproduce the markings. +## * SPDX-License-Identifier: BSD-2-Clause-Patent ## */ ##/** ## * An example daos EPOCH IO test conf file. diff --git a/src/tests/suite/io_conf/daos_io_conf_3 b/src/tests/suite/io_conf/daos_io_conf_3 index 5f6c4deb133..4757743fdd2 100644 --- a/src/tests/suite/io_conf/daos_io_conf_3 +++ b/src/tests/suite/io_conf/daos_io_conf_3 @@ -1,24 +1,7 @@ #/* -## * (C) Copyright 2018-2019 Intel Corporation. +## * (C) Copyright 2018-2021 Intel Corporation. ## * -## * Licensed under the Apache License, Version 2.0 (the "License"); -## * you may not use this file except in compliance with the License. -## * You may obtain a copy of the License at -## * -## * http://www.apache.org/licenses/LICENSE-2.0 -## * -## * Unless required by applicable law or agreed to in writing, software -## * distributed under the License is distributed on an "AS IS" BASIS, -## * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## * See the License for the specific language governing permissions and -## * limitations under the License. -## * -## * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -## * The Government's rights to use, modify, reproduce, release, perform, display, -## * or disclose this software are subject to the terms of the Apache License as -## * provided in Contract No. B609815. -## * Any reproduction of computer software, computer software documentation, or -## * portions thereof marked with this legend must also reproduce the markings. +## * SPDX-License-Identifier: BSD-2-Clause-Patent ## */ ##/** ## * An example daos EPOCH IO test conf file. diff --git a/src/tests/suite/io_conf/daos_io_conf_4 b/src/tests/suite/io_conf/daos_io_conf_4 index fd469f30434..30a0b107d4e 100644 --- a/src/tests/suite/io_conf/daos_io_conf_4 +++ b/src/tests/suite/io_conf/daos_io_conf_4 @@ -1,24 +1,7 @@ #/* -## * (C) Copyright 2018-2019 Intel Corporation. +## * (C) Copyright 2018-2021 Intel Corporation. ## * -## * Licensed under the Apache License, Version 2.0 (the "License"); -## * you may not use this file except in compliance with the License. -## * You may obtain a copy of the License at -## * -## * http://www.apache.org/licenses/LICENSE-2.0 -## * -## * Unless required by applicable law or agreed to in writing, software -## * distributed under the License is distributed on an "AS IS" BASIS, -## * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## * See the License for the specific language governing permissions and -## * limitations under the License. -## * -## * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -## * The Government's rights to use, modify, reproduce, release, perform, display, -## * or disclose this software are subject to the terms of the Apache License as -## * provided in Contract No. B609815. -## * Any reproduction of computer software, computer software documentation, or -## * portions thereof marked with this legend must also reproduce the markings. +## * SPDX-License-Identifier: BSD-2-Clause-Patent ## */ ##/** ## * An example daos EPOCH IO test conf file. diff --git a/src/tests/suite/io_conf/daos_io_conf_5 b/src/tests/suite/io_conf/daos_io_conf_5 index efe28e867ca..21de68929ea 100644 --- a/src/tests/suite/io_conf/daos_io_conf_5 +++ b/src/tests/suite/io_conf/daos_io_conf_5 @@ -1,24 +1,7 @@ #/* -## * (C) Copyright 2018-2019 Intel Corporation. +## * (C) Copyright 2018-2021 Intel Corporation. ## * -## * Licensed under the Apache License, Version 2.0 (the "License"); -## * you may not use this file except in compliance with the License. -## * You may obtain a copy of the License at -## * -## * http://www.apache.org/licenses/LICENSE-2.0 -## * -## * Unless required by applicable law or agreed to in writing, software -## * distributed under the License is distributed on an "AS IS" BASIS, -## * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## * See the License for the specific language governing permissions and -## * limitations under the License. -## * -## * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -## * The Government's rights to use, modify, reproduce, release, perform, display, -## * or disclose this software are subject to the terms of the Apache License as -## * provided in Contract No. B609815. -## * Any reproduction of computer software, computer software documentation, or -## * portions thereof marked with this legend must also reproduce the markings. +## * SPDX-License-Identifier: BSD-2-Clause-Patent ## */ ##/** ## * An example daos EPOCH IO test conf file. diff --git a/src/utils/crt_launch/SConscript b/src/utils/crt_launch/SConscript index 3a8723ecb71..b423a4d9996 100644 --- a/src/utils/crt_launch/SConscript +++ b/src/utils/crt_launch/SConscript @@ -1,24 +1,7 @@ #!python -# (C) Copyright 2016-2020 Intel Corporation. +# (C) Copyright 2016-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # """Build crt_launch""" import os diff --git a/src/utils/ctl/SConscript b/src/utils/ctl/SConscript index 55ff5f6122e..b9835136737 100644 --- a/src/utils/ctl/SConscript +++ b/src/utils/ctl/SConscript @@ -1,24 +1,7 @@ #!python -# (C) Copyright 2018-2020 Intel Corporation. +# (C) Copyright 2018-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # """Build cart_ctl test""" diff --git a/src/utils/daos_metrics/SConscript b/src/utils/daos_metrics/SConscript index 7221afa4e9b..fcc24c02d25 100644 --- a/src/utils/daos_metrics/SConscript +++ b/src/utils/daos_metrics/SConscript @@ -1,23 +1,7 @@ # (C) Copyright 2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# SPDX-License-Identifier: BSD-2-Clause-Patent # -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. """DAOS metrics utility""" import daos_build diff --git a/src/utils/daos_metrics/daos_metrics.c b/src/utils/daos_metrics/daos_metrics.c index 4c80a0673fc..f35affba908 100644 --- a/src/utils/daos_metrics/daos_metrics.c +++ b/src/utils/daos_metrics/daos_metrics.c @@ -1,24 +1,7 @@ /* * (C) Copyright 2021 Intel Corporation. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE - * The Government's rights to use, modify, reproduce, release, perform, display, - * or disclose this software are subject to the terms of the Apache License as - * provided in Contract No. 8F-30005. - * Any reproduction of computer software, computer software documentation, or - * portions thereof marked with this legend must also reproduce the markings. + * SPDX-License-Identifier: BSD-2-Clause-Patent */ /* diff --git a/src/utils/self_test/SConscript b/src/utils/self_test/SConscript index ccc79e079f2..e7bc9d7bd96 100644 --- a/src/utils/self_test/SConscript +++ b/src/utils/self_test/SConscript @@ -1,24 +1,7 @@ #!python -# (C) Copyright 2016-2020 Intel Corporation. +# (C) Copyright 2016-2021 Intel Corporation. # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# GOVERNMENT LICENSE RIGHTS-OPEN SOURCE SOFTWARE -# The Government's rights to use, modify, reproduce, release, perform, display, -# or disclose this software are subject to the terms of the Apache License as -# provided in Contract No. 8F-30005. -# Any reproduction of computer software, computer software documentation, or -# portions thereof marked with this legend must also reproduce the markings. +# SPDX-License-Identifier: BSD-2-Clause-Patent # """Build self test"""