From 180186297b9d42bed17f5334cf01b8d15c662970 Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Tue, 18 Feb 2020 00:19:45 +0000 Subject: [PATCH 1/6] Add copyright and license information --- COPYRIGHT | 19 +++++ LICENSE-APACHE | 202 +++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE-MIT | 8 ++ 3 files changed, 229 insertions(+) create mode 100644 COPYRIGHT create mode 100644 LICENSE-APACHE create mode 100644 LICENSE-MIT diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 00000000000..235f44a22cc --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,19 @@ +Copyright Amazon.com, Inc., its affiliates, or other contributors. All Rights Reserved. + +Except as otherwise noted (below and/or in individual files), Bottlerocket is dual-licensed under +the Apache License, version 2.0 or the MIT license , at your option. + +Copyrights in Bottlerocket are retained by their contributors. No copyright assignment is required +to contribute to Bottlerocket. Contributions to Bottlerocket are explicitly made under both the +Apache License, version 2.0, and the MIT license. For full authorship information, see the version +control history. + +Bottlerocket operating system images include packages written by third parties, which may carry +their own copyright notices and license terms. These are available in /usr/share/licenses on the +operating system images. + +=^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= =^..^= + +macros/rust and macros/cargo (used during build) are derived from the Fedora Rust SIG's rust2rpm. +https://pagure.io/fedora-rust/rust2rpm +Copyright (c) 2017 Igor Gnatenko diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,202 @@ + + 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/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 00000000000..df3c0d623a8 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,8 @@ +MIT License +Copyright Amazon.com, Inc., its affiliates, or other contributors. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From e5866763eff47e0be76431c028908701016f92b2 Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Tue, 18 Feb 2020 00:20:26 +0000 Subject: [PATCH 2/6] Update CONTRIBUTING.md and pull request template --- .github/PULL_REQUEST_TEMPLATE/main.md | 21 --------------------- .github/pull_request_template.md | 21 +++++++++++++++++++++ CONTRIBUTING.md | 4 +--- 3 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE/main.md create mode 100644 .github/pull_request_template.md diff --git a/.github/PULL_REQUEST_TEMPLATE/main.md b/.github/PULL_REQUEST_TEMPLATE/main.md deleted file mode 100644 index 692a06252fa..00000000000 --- a/.github/PULL_REQUEST_TEMPLATE/main.md +++ /dev/null @@ -1,21 +0,0 @@ - - -**Issue number:** - - - -**Description of changes:** - - - -**Testing done:** - - - -**Terms of contribution:** - -By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000000..ef6d9a11284 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,21 @@ + + +**Issue number:** + + + +**Description of changes:** + + + +**Testing done:** + + + +**Terms of contribution:** + +By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e19d5b7d072..c8e163e0653 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,7 +57,5 @@ Please do **not** create a public GitHub issue. ## Licensing -See the [LICENSE](https://github.com/amazonlinux/PRIVATE-thar/blob/master/LICENSE) file for our project's licensing. +See the [COPYRIGHT](COPYRIGHT) file for our project's licensing. We will ask you to confirm the licensing of your contribution. - -We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes. From 9b97ca117a865d3cdad4530ea37ae05e161f0f06 Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Tue, 18 Feb 2020 00:20:57 +0000 Subject: [PATCH 3/6] Add explicit copyright information to derived macro files --- macros/cargo | 6 +++++- macros/rust | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/macros/cargo b/macros/cargo index 2cbc76e8001..cf2dfcba6c3 100644 --- a/macros/cargo +++ b/macros/cargo @@ -1,5 +1,9 @@ +# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. # SPDX-License-Identifier: MIT -# https://github.com/amazonlinux/rust-bundled-packaging/blob/master/macros.cargo +# +# Originally derived from https://github.com/amazonlinux/rust-bundled-packaging +# which is in turn derived from https://pagure.io/fedora-rust/rust2rpm +# Copyright (c) 2017 Igor Gnatenko # Changes for Bottlerocket: # - Remove _cargometadir, no automatic bundled() provides diff --git a/macros/rust b/macros/rust index bfcdf086bf4..669beac6a74 100644 --- a/macros/rust +++ b/macros/rust @@ -1,5 +1,9 @@ +# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. # SPDX-License-Identifier: MIT -# https://github.com/amazonlinux/rust-bundled-packaging/blob/master/macros.rust +# +# Originally derived from https://github.com/amazonlinux/rust-bundled-packaging +# which is in turn derived from https://pagure.io/fedora-rust/rust2rpm +# Copyright (c) 2017 Igor Gnatenko %__rustc %{_bindir}/rustc %__rustdoc %{_bindir}/rustdoc From 5b3b9b9bf6d16a208fd058c96e3e5c45445d6963 Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Tue, 18 Feb 2020 00:22:52 +0000 Subject: [PATCH 4/6] Add license metadata to first-party code --- packages/filesystem/filesystem.spec | 2 +- packages/host-ctr/host-ctr.spec | 2 +- packages/login/login.spec | 2 +- packages/release/release.spec | 2 +- packages/workspaces/workspaces.spec | 2 +- tools/buildsys/Cargo.toml | 1 + tools/buildsys/deny.toml | 4 ---- workspaces/api/apiclient/Cargo.toml | 1 + workspaces/api/apiserver/Cargo.toml | 1 + workspaces/api/bork/Cargo.toml | 1 + workspaces/api/data_store_version/Cargo.toml | 1 + workspaces/api/host-containers/Cargo.toml | 1 + workspaces/api/migration/migration-helpers/Cargo.toml | 1 + .../api/migration/migrations/v0.1/migrate-borkseed/Cargo.toml | 1 + .../v0.1/migrate-host-containers-version/Cargo.toml | 1 + .../migrations/v0.2/migrate-containerd-config-path/Cargo.toml | 1 + .../migrations/v0.2/migrate-host-containers-v03/Cargo.toml | 1 + .../migrations/v0.2/migrate-remove-region/Cargo.toml | 1 + workspaces/api/migration/migrator/Cargo.toml | 1 + workspaces/api/moondog/Cargo.toml | 1 + workspaces/api/netdog/Cargo.toml | 1 + workspaces/api/pluto/Cargo.toml | 1 + workspaces/api/schnauzer/Cargo.toml | 1 + workspaces/api/servicedog/Cargo.toml | 1 + workspaces/api/settings-committer/Cargo.toml | 1 + workspaces/api/storewolf/Cargo.toml | 1 + workspaces/api/sundog/Cargo.toml | 1 + workspaces/api/thar-be-settings/Cargo.toml | 1 + workspaces/bottlerocket-release/Cargo.toml | 1 + workspaces/deny.toml | 4 ---- workspaces/growpart/Cargo.toml | 1 + workspaces/models/Cargo.toml | 1 + workspaces/models/model-derive/Cargo.toml | 1 + workspaces/preinit/laika/Cargo.toml | 1 + workspaces/updater/block-party/Cargo.toml | 1 + workspaces/updater/signpost/Cargo.toml | 1 + workspaces/updater/update_metadata/Cargo.toml | 1 + workspaces/updater/updog/Cargo.toml | 1 + workspaces/webpki-roots-shim/Cargo.toml | 1 + 39 files changed, 37 insertions(+), 13 deletions(-) diff --git a/packages/filesystem/filesystem.spec b/packages/filesystem/filesystem.spec index 333ca0a2df2..317f5484262 100644 --- a/packages/filesystem/filesystem.spec +++ b/packages/filesystem/filesystem.spec @@ -4,7 +4,7 @@ Name: %{_cross_os}filesystem Version: 1.0 Release: 1%{?dist} Summary: The basic directory layout -License: LicenseRef-Pending +License: Apache-2.0 OR MIT BuildArch: noarch %description diff --git a/packages/host-ctr/host-ctr.spec b/packages/host-ctr/host-ctr.spec index 6ae6c624acd..501e1930e39 100644 --- a/packages/host-ctr/host-ctr.spec +++ b/packages/host-ctr/host-ctr.spec @@ -5,7 +5,7 @@ Name: %{_cross_os}%{workspace_name} Version: 0.0 Release: 0%{?dist} Summary: Bottlerocket host container runner -License: LicenseRef-Pending +License: Apache-2.0 OR MIT BuildRequires: %{_cross_os}glibc-devel Requires: %{_cross_os}containerd diff --git a/packages/login/login.spec b/packages/login/login.spec index b5dd68c5336..c825e9fca53 100644 --- a/packages/login/login.spec +++ b/packages/login/login.spec @@ -4,7 +4,7 @@ Name: %{_cross_os}login Version: 0.0.1 Release: 1%{?dist} Summary: A login helper -License: LicenseRef-Pending +License: Apache-2.0 OR MIT Source0: login BuildRequires: %{_cross_os}glibc-devel Requires: %{_cross_os}bash diff --git a/packages/release/release.spec b/packages/release/release.spec index ae766ea46aa..e995eccc2d0 100644 --- a/packages/release/release.spec +++ b/packages/release/release.spec @@ -4,7 +4,7 @@ Name: %{_cross_os}release Version: 0.0 Release: 0%{?dist} Summary: Bottlerocket release -License: LicenseRef-Pending +License: Apache-2.0 OR MIT Source10: hosts Source11: nsswitch.conf diff --git a/packages/workspaces/workspaces.spec b/packages/workspaces/workspaces.spec index 7acdfe89001..595adfeec1a 100644 --- a/packages/workspaces/workspaces.spec +++ b/packages/workspaces/workspaces.spec @@ -6,7 +6,7 @@ Name: %{_cross_os}workspaces Version: 0.0 Release: 0%{?dist} Summary: Bottlerocket's first-party code -License: LicenseRef-Pending +License: Apache-2.0 OR MIT # sources < 100: misc Source1: data-store-version diff --git a/tools/buildsys/Cargo.toml b/tools/buildsys/Cargo.toml index 4879d811901..c2b662316fd 100644 --- a/tools/buildsys/Cargo.toml +++ b/tools/buildsys/Cargo.toml @@ -2,6 +2,7 @@ name = "buildsys" version = "0.1.0" authors = ["Ben Cressey "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/tools/buildsys/deny.toml b/tools/buildsys/deny.toml index 46aecf934dd..8685fb591d0 100644 --- a/tools/buildsys/deny.toml +++ b/tools/buildsys/deny.toml @@ -25,10 +25,6 @@ exceptions = [ { name = "webpki-roots", allow = ["MPL-2.0"], version = "*" }, ] -# FIXME: Remove this when a license is assigned for first-party packages -[licenses.private] -ignore = true - [[licenses.clarify]] name = "ring" expression = "MIT AND ISC AND OpenSSL" diff --git a/workspaces/api/apiclient/Cargo.toml b/workspaces/api/apiclient/Cargo.toml index 3c239739433..fbbd2b6de1a 100644 --- a/workspaces/api/apiclient/Cargo.toml +++ b/workspaces/api/apiclient/Cargo.toml @@ -2,6 +2,7 @@ name = "apiclient" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/apiserver/Cargo.toml b/workspaces/api/apiserver/Cargo.toml index a1f9af461ce..700baf99a4c 100644 --- a/workspaces/api/apiserver/Cargo.toml +++ b/workspaces/api/apiserver/Cargo.toml @@ -2,6 +2,7 @@ name = "apiserver" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/bork/Cargo.toml b/workspaces/api/bork/Cargo.toml index a56eee0371f..54993f844c5 100644 --- a/workspaces/api/bork/Cargo.toml +++ b/workspaces/api/bork/Cargo.toml @@ -2,6 +2,7 @@ name = "bork" version = "0.1.0" authors = ["Samuel Mendoza-Jonas "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/data_store_version/Cargo.toml b/workspaces/api/data_store_version/Cargo.toml index 0a4917d95ce..19a30a335ad 100644 --- a/workspaces/api/data_store_version/Cargo.toml +++ b/workspaces/api/data_store_version/Cargo.toml @@ -2,6 +2,7 @@ name = "data_store_version" version = "0.1.0" authors = ["mrowicki "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/host-containers/Cargo.toml b/workspaces/api/host-containers/Cargo.toml index 6b484608287..f204c6a7bf2 100644 --- a/workspaces/api/host-containers/Cargo.toml +++ b/workspaces/api/host-containers/Cargo.toml @@ -2,6 +2,7 @@ name = "host-containers" version = "0.1.0" authors = ["Tom Kirchner ", "Zac Mrowicki "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/migration/migration-helpers/Cargo.toml b/workspaces/api/migration/migration-helpers/Cargo.toml index 09eca7beb09..5c5d4919222 100644 --- a/workspaces/api/migration/migration-helpers/Cargo.toml +++ b/workspaces/api/migration/migration-helpers/Cargo.toml @@ -2,6 +2,7 @@ name = "migration-helpers" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/migration/migrations/v0.1/migrate-borkseed/Cargo.toml b/workspaces/api/migration/migrations/v0.1/migrate-borkseed/Cargo.toml index 0e498d97e52..2f1725bd0ae 100644 --- a/workspaces/api/migration/migrations/v0.1/migrate-borkseed/Cargo.toml +++ b/workspaces/api/migration/migrations/v0.1/migrate-borkseed/Cargo.toml @@ -2,6 +2,7 @@ name = "migrate-borkseed" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/migration/migrations/v0.1/migrate-host-containers-version/Cargo.toml b/workspaces/api/migration/migrations/v0.1/migrate-host-containers-version/Cargo.toml index 88417accf81..22d874232a9 100644 --- a/workspaces/api/migration/migrations/v0.1/migrate-host-containers-version/Cargo.toml +++ b/workspaces/api/migration/migrations/v0.1/migrate-host-containers-version/Cargo.toml @@ -2,6 +2,7 @@ name = "migrate-host-containers-version" version = "0.1.0" authors = ["Erikson Tung "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/migration/migrations/v0.2/migrate-containerd-config-path/Cargo.toml b/workspaces/api/migration/migrations/v0.2/migrate-containerd-config-path/Cargo.toml index 844f20af0cc..ab5e245036f 100644 --- a/workspaces/api/migration/migrations/v0.2/migrate-containerd-config-path/Cargo.toml +++ b/workspaces/api/migration/migrations/v0.2/migrate-containerd-config-path/Cargo.toml @@ -2,6 +2,7 @@ name = "migrate-containerd-config-path" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/migration/migrations/v0.2/migrate-host-containers-v03/Cargo.toml b/workspaces/api/migration/migrations/v0.2/migrate-host-containers-v03/Cargo.toml index 6b0c4526d96..170b3a591ba 100644 --- a/workspaces/api/migration/migrations/v0.2/migrate-host-containers-v03/Cargo.toml +++ b/workspaces/api/migration/migrations/v0.2/migrate-host-containers-v03/Cargo.toml @@ -2,6 +2,7 @@ name = "migrate-host-containers-v03" version = "0.1.0" authors = ["Erikson Tung "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/migration/migrations/v0.2/migrate-remove-region/Cargo.toml b/workspaces/api/migration/migrations/v0.2/migrate-remove-region/Cargo.toml index 499097ec5ed..f92aa74f7ea 100644 --- a/workspaces/api/migration/migrations/v0.2/migrate-remove-region/Cargo.toml +++ b/workspaces/api/migration/migrations/v0.2/migrate-remove-region/Cargo.toml @@ -2,6 +2,7 @@ name = "migrate-remove-region" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/migration/migrator/Cargo.toml b/workspaces/api/migration/migrator/Cargo.toml index c671a6b024e..d5b480d7b60 100644 --- a/workspaces/api/migration/migrator/Cargo.toml +++ b/workspaces/api/migration/migrator/Cargo.toml @@ -2,6 +2,7 @@ name = "migrator" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/moondog/Cargo.toml b/workspaces/api/moondog/Cargo.toml index 27a0db100c1..2a13c1bd541 100644 --- a/workspaces/api/moondog/Cargo.toml +++ b/workspaces/api/moondog/Cargo.toml @@ -2,6 +2,7 @@ name = "moondog" version = "0.1.0" authors = ["Zac Mrowicki "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/netdog/Cargo.toml b/workspaces/api/netdog/Cargo.toml index 53298210d2c..dd02578375b 100644 --- a/workspaces/api/netdog/Cargo.toml +++ b/workspaces/api/netdog/Cargo.toml @@ -2,6 +2,7 @@ name = "netdog" version = "0.1.0" authors = ["Ben Cressey "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/api/pluto/Cargo.toml b/workspaces/api/pluto/Cargo.toml index b0cc1439a52..2e0a3108aa2 100644 --- a/workspaces/api/pluto/Cargo.toml +++ b/workspaces/api/pluto/Cargo.toml @@ -2,6 +2,7 @@ name = "pluto" version = "0.1.0" authors = ["Michael Patraw "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/schnauzer/Cargo.toml b/workspaces/api/schnauzer/Cargo.toml index 4cc03ff7803..d8d6975b409 100644 --- a/workspaces/api/schnauzer/Cargo.toml +++ b/workspaces/api/schnauzer/Cargo.toml @@ -2,6 +2,7 @@ name = "schnauzer" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/servicedog/Cargo.toml b/workspaces/api/servicedog/Cargo.toml index 1f260fe44ec..dbbc8c3f5b4 100644 --- a/workspaces/api/servicedog/Cargo.toml +++ b/workspaces/api/servicedog/Cargo.toml @@ -2,6 +2,7 @@ name = "servicedog" version = "0.1.0" authors = ["Zac Mrowicki "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/settings-committer/Cargo.toml b/workspaces/api/settings-committer/Cargo.toml index 33d19c79610..38992f079d0 100644 --- a/workspaces/api/settings-committer/Cargo.toml +++ b/workspaces/api/settings-committer/Cargo.toml @@ -2,6 +2,7 @@ name = "settings-committer" version = "0.1.0" authors = ["Michael Patraw "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/storewolf/Cargo.toml b/workspaces/api/storewolf/Cargo.toml index 47b78b9b4a4..1ee8efb24b6 100644 --- a/workspaces/api/storewolf/Cargo.toml +++ b/workspaces/api/storewolf/Cargo.toml @@ -2,6 +2,7 @@ name = "storewolf" version = "0.1.0" authors = ["Zac Mrowicki "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/sundog/Cargo.toml b/workspaces/api/sundog/Cargo.toml index c26bd6c4700..edc07581968 100644 --- a/workspaces/api/sundog/Cargo.toml +++ b/workspaces/api/sundog/Cargo.toml @@ -2,6 +2,7 @@ name = "sundog" version = "0.1.0" authors = ["mrowicki "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/api/thar-be-settings/Cargo.toml b/workspaces/api/thar-be-settings/Cargo.toml index e3cb9d68610..0510cd2cd2d 100644 --- a/workspaces/api/thar-be-settings/Cargo.toml +++ b/workspaces/api/thar-be-settings/Cargo.toml @@ -2,6 +2,7 @@ name = "thar-be-settings" version = "0.1.0" authors = ["Zac Mrowicki "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/bottlerocket-release/Cargo.toml b/workspaces/bottlerocket-release/Cargo.toml index a4076269c69..3e4cdd8c812 100644 --- a/workspaces/bottlerocket-release/Cargo.toml +++ b/workspaces/bottlerocket-release/Cargo.toml @@ -2,6 +2,7 @@ name = "bottlerocket-release" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/deny.toml b/workspaces/deny.toml index a95c965ef22..b058611b7ca 100644 --- a/workspaces/deny.toml +++ b/workspaces/deny.toml @@ -26,10 +26,6 @@ exceptions = [ { name = "copyless", allow = ["MPL-2.0"], version = "*" }, ] -# FIXME: Remove this when a license is assigned for first-party packages -[licenses.private] -ignore = true - [[licenses.clarify]] name = "ring" expression = "MIT AND ISC AND OpenSSL" diff --git a/workspaces/growpart/Cargo.toml b/workspaces/growpart/Cargo.toml index 10eb9fa75dd..76dffd7e901 100644 --- a/workspaces/growpart/Cargo.toml +++ b/workspaces/growpart/Cargo.toml @@ -2,6 +2,7 @@ name = "growpart" version = "0.1.0" authors = ["Ben Cressey "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/models/Cargo.toml b/workspaces/models/Cargo.toml index 9d0ffc42ad3..c998daba9ec 100644 --- a/workspaces/models/Cargo.toml +++ b/workspaces/models/Cargo.toml @@ -2,6 +2,7 @@ name = "models" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/models/model-derive/Cargo.toml b/workspaces/models/model-derive/Cargo.toml index 62cf6f557cc..582ba80a325 100644 --- a/workspaces/models/model-derive/Cargo.toml +++ b/workspaces/models/model-derive/Cargo.toml @@ -2,6 +2,7 @@ name = "model-derive" version = "0.1.0" authors = ["Tom Kirchner "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/preinit/laika/Cargo.toml b/workspaces/preinit/laika/Cargo.toml index 25a2759017c..5b7eb37b4a5 100644 --- a/workspaces/preinit/laika/Cargo.toml +++ b/workspaces/preinit/laika/Cargo.toml @@ -2,6 +2,7 @@ name = "laika" version = "0.1.0" authors = ["Erikson Tung "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false build = "build.rs" diff --git a/workspaces/updater/block-party/Cargo.toml b/workspaces/updater/block-party/Cargo.toml index f0643c32c1b..086f1982d2c 100644 --- a/workspaces/updater/block-party/Cargo.toml +++ b/workspaces/updater/block-party/Cargo.toml @@ -2,6 +2,7 @@ name = "block-party" version = "0.1.0" authors = ["iliana destroyer of worlds "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/updater/signpost/Cargo.toml b/workspaces/updater/signpost/Cargo.toml index fbacb344ccc..1b6d99e276f 100644 --- a/workspaces/updater/signpost/Cargo.toml +++ b/workspaces/updater/signpost/Cargo.toml @@ -2,6 +2,7 @@ name = "signpost" version = "0.1.0" authors = ["iliana destroyer of worlds "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/updater/update_metadata/Cargo.toml b/workspaces/updater/update_metadata/Cargo.toml index 89d0dcba2f0..f396db6f967 100644 --- a/workspaces/updater/update_metadata/Cargo.toml +++ b/workspaces/updater/update_metadata/Cargo.toml @@ -2,6 +2,7 @@ name = "update_metadata" version = "0.1.0" authors = ["Samuel Mendoza-Jonas "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/updater/updog/Cargo.toml b/workspaces/updater/updog/Cargo.toml index d5ba1706bd2..01c538de219 100644 --- a/workspaces/updater/updog/Cargo.toml +++ b/workspaces/updater/updog/Cargo.toml @@ -2,6 +2,7 @@ name = "updog" version = "0.1.0" authors = ["iliana destroyer of worlds "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false diff --git a/workspaces/webpki-roots-shim/Cargo.toml b/workspaces/webpki-roots-shim/Cargo.toml index 1e70e222edf..68b4e0139fe 100644 --- a/workspaces/webpki-roots-shim/Cargo.toml +++ b/workspaces/webpki-roots-shim/Cargo.toml @@ -2,6 +2,7 @@ name = "webpki-roots" version = "0.17.0" authors = ["iliana destroyer of worlds "] +license = "Apache-2.0 OR MIT" edition = "2018" publish = false From de7495b574b6bfc231205a61cd000db02c884744 Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Tue, 18 Feb 2020 01:00:40 +0000 Subject: [PATCH 5/6] Install top-level copyright/license to /usr/share/licenses --- tools/rpm2img | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/rpm2img b/tools/rpm2img index 2b9647a1461..f82451f7577 100755 --- a/tools/rpm2img +++ b/tools/rpm2img @@ -75,6 +75,7 @@ sgdisk --clear \ --sort --print "${DISK_IMAGE}" rpm -iv --root "${ROOT_MOUNT}" "${PACKAGE_DIR}"/*.rpm +install -p -m 0644 /host/{COPYRIGHT,LICENSE-APACHE,LICENSE-MIT} "${ROOT_MOUNT}"/usr/share/licenses/ mksquashfs "${ROOT_MOUNT}"/usr/share/licenses "${ROOT_MOUNT}"/usr/share/bottlerocket/licenses.squashfs rm -rf "${ROOT_MOUNT}"/var/lib "${ROOT_MOUNT}"/usr/share/licenses/* From e7acc742be39a50a7fa2bd0121684233652e7c78 Mon Sep 17 00:00:00 2001 From: iliana destroyer of worlds Date: Tue, 18 Feb 2020 18:12:22 +0000 Subject: [PATCH 6/6] Remove _cross_os prefix from license dirs --- macros/shared | 10 ++++++---- packages/systemd/systemd.spec | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/macros/shared b/macros/shared index e0c1c039e3f..15d3fdb13b1 100644 --- a/macros/shared +++ b/macros/shared @@ -45,6 +45,8 @@ %_cross_usrsrc %{_cross_prefix}/src %_cross_licensedir %{_cross_datadir}/licenses %_defaultlicensedir %{_cross_licensedir} +%_uncross_name %(name=%{name}; echo ${name#%{_cross_os}}) +%_docdir_fmt %{_uncross_name} %set_cross_build_flags \ CFLAGS="${CFLAGS:-%{_cross_cflags}}" ; export CFLAGS ; \ @@ -178,14 +180,14 @@ CROSS_COMPILATION_CONF_EOF\ %set_cross_go_flags \ cd GOPATH/src/%1 ; \ -%_cross_attribution_file %{_cross_licensedir}/%{name}/attribution.txt +%_cross_attribution_file %{_cross_licensedir}/%{_uncross_name}/attribution.txt %cross_generate_attribution \ if [ 0%{?_cross_first_party} -eq 0 ]; then \ - mkdir -p %{buildroot}%{_cross_licensedir}/%{name} \ + mkdir -p %{buildroot}%{_cross_licensedir}/%{_uncross_name} \ echo "%{name} - %{url}" >> %{buildroot}%{_cross_attribution_file} \ echo "SPDX-License-Identifier: %{license}" >> %{buildroot}%{_cross_attribution_file} \ fi -%_cross_attribution_vendor_dir %{_cross_licensedir}/%{name}/vendor +%_cross_attribution_vendor_dir %{_cross_licensedir}/%{_uncross_name}/vendor %cross_scan_attribution \ bottlerocket-license-scan --spdx-data /usr/libexec/tools/spdx-data --out-dir %{buildroot}%{_cross_attribution_vendor_dir} @@ -213,6 +215,6 @@ CROSS_COMPILATION_CONF_EOF\ %__brp_mangle_shebangs /bin/true %__arch_install_post \ - /usr/lib/rpm/check-rpaths \ + %{?!_cross_allow_rpath:/usr/lib/rpm/check-rpaths} \ /usr/lib/rpm/check-buildroot \ %cross_generate_attribution diff --git a/packages/systemd/systemd.spec b/packages/systemd/systemd.spec index 4c6ede3f653..0ccf0f46d4d 100644 --- a/packages/systemd/systemd.spec +++ b/packages/systemd/systemd.spec @@ -1,7 +1,5 @@ # Skip check-rpaths since we expect them for systemd. -%global __arch_install_post \ - /usr/lib/rpm/check-buildroot \ - %cross_generate_attribution +%global _cross_allow_rpath 1 Name: %{_cross_os}systemd Version: 244