Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add license metadata to first-party code #746

Merged
merged 6 commits into from
Feb 19, 2020
Merged

Add license metadata to first-party code #746

merged 6 commits into from
Feb 19, 2020

Conversation

iliana
Copy link
Contributor

@iliana iliana commented Feb 18, 2020

Issue number:

#469

Description of changes:

This adds the top-level license files for Bottlerocket, sets the relevant metadata in the right places, and cleans up a few copyright-related things.

Non-nit requests for changes will likely need to go through a lawyer, so be careful what you wish for. :)

We somehow lost our pull request template in the move from the old repo, so it seemed the old file path wasn't working. This one might. Hard to test without merging (I copied and pasted it into this PR description).

Testing done:

An image builds. /usr/share/licenses (after mounting) looks fine.

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.


**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.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This particular verbiage needs to be added to the pull request template in our other repos.

COPYRIGHT Show resolved Hide resolved
Comment on lines +1 to +2
MIT License
Copyright Amazon.com, Inc., its affiliates, or other contributors. All Rights Reserved.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm being precise, there should be a blank line between these two. Most likely any SPDX matching thing is still going to match it though.

Comment on lines 122 to 126
mkdir -p %{buildroot}%{_cross_licensedir}/$lib
echo "$lib - %{url}" >> %{buildroot}%{_cross_licensedir}/$lib/attribution.txt
mkdir -p %{buildroot}%{_cross_licensedir}/%{_cross_os}$lib
echo "$lib - %{url}" >> %{buildroot}%{_cross_licensedir}/%{_cross_os}$lib/attribution.txt
done
echo "SPDX-License-Identifier: LGPL-2.1-or-later" | tee -a %{buildroot}%{_cross_licensedir}/lib{blkid,mount,smartcols}/attribution.txt >/dev/null
echo "SPDX-License-Identifier: BSD-3-Clause" | tee -a %{buildroot}%{_cross_licensedir}/libuuid/attribution.txt
echo "SPDX-License-Identifier: LGPL-2.1-or-later" | tee -a %{buildroot}%{_cross_licensedir}/%{_cross_os}lib{blkid,mount,smartcols}/attribution.txt >/dev/null
echo "SPDX-License-Identifier: BSD-3-Clause" | tee -a %{buildroot}%{_cross_licensedir}/%{_cross_os}libuuid/attribution.txt

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes, and others in this file, look unrelated.
On the other hand, they are related to license metadata at least.

Copy link

@ajorg-aws ajorg-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

packages/util-linux/util-linux.spec Outdated Show resolved Hide resolved
@iliana
Copy link
Contributor Author

iliana commented Feb 19, 2020

This most recent push replaces the last commit with one that removes the %{_cross_os} prefix from all the directories in /usr/share/licenses. @tjkirch

macros/shared Show resolved Hide resolved
@iliana iliana merged commit 31206f5 into develop Feb 19, 2020
@tjkirch tjkirch deleted the copyright branch February 21, 2020 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants