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

license: Add text of GPL-2.0 and BSD-2 licenses to repository #749

Merged
merged 1 commit into from
Jul 1, 2024

Conversation

jamesr
Copy link
Contributor

@jamesr jamesr commented Jun 26, 2024

Resolves #748. The BSD license text's year and copyright holder are copied from https://github.com/OP-TEE/optee_os/blob/master/LICENSE

LICENSE-BSD Outdated
@@ -0,0 +1,24 @@
Copyright (c) 2015, Linaro Limited
All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

Please drop this line, it's not part of the 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.

Done

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My apologies Jens - in applying this fix I removed the first and the second line. The second line here is not part of the license, but the first is. I've uploaded a fix as #752

@jamesr jamesr force-pushed the add_license_text_issue_748 branch from 9f0f1a5 to 156c695 Compare June 27, 2024 15:52
@jenswi-linaro
Copy link
Contributor

Reviewed-by: Jens Wiklander <[email protected]>

Signed-off-by: James Robinson <[email protected]>
Reviewed-by: Jens Wiklander <[email protected]>
@jamesr jamesr force-pushed the add_license_text_issue_748 branch from 156c695 to f19d018 Compare June 28, 2024 16:55
@jforissier jforissier merged commit a748f5f into OP-TEE:master Jul 1, 2024
1 check passed
@sahilnxp
Copy link
Contributor

sahilnxp commented Jul 3, 2024

Please correct me If I am wrong, if LICENSE.md Checksum should also be updated here: https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-test.inc?h=scarthgap#n6 ?

@jforissier
Copy link
Contributor

Please correct me If I am wrong, if LICENSE.md Checksum should also be updated here: https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-test.inc?h=scarthgap#n6 ?

I think so. @mikkorapeli-linaro FYI.

@mikkorapeli-linaro
Copy link

Please correct me If I am wrong, if LICENSE.md Checksum should also be updated here: https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-test.inc?h=scarthgap#n6 ?

I think so. @mikkorapeli-linaro FYI.

meta-arm recipe for optee already has correct LICENSE variable set so only the checksum needs to be modified once the LICENSE.md file changes are effective in an optee version update. These changes for meta-arm master branch where optee updates are ok and likely not for scarthgap LTS branch where only bug fixes should be applied.

@sahilnxp
Copy link
Contributor

sahilnxp commented Jul 3, 2024

Please correct me If I am wrong, if LICENSE.md Checksum should also be updated here: https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-test.inc?h=scarthgap#n6 ?

I think so. @mikkorapeli-linaro FYI.

meta-arm recipe for optee already has correct LICENSE variable set so only the checksum needs to be modified once the LICENSE.md file changes are effective in an optee version update. These changes for meta-arm master branch where optee updates are ok and likely not for scarthgap LTS branch where only bug fixes should be applied.

Yes, Since the Commit currently being used in https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-test_4.2.0.bb#n3 is 526d5ba, It will work fine.

Got your point, Thanks.
So this will be updated after 4.3.0 OP-TEE release, right?

@mikkorapeli-linaro
Copy link

Please correct me If I am wrong, if LICENSE.md Checksum should also be updated here: https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-test.inc?h=scarthgap#n6 ?

I think so. @mikkorapeli-linaro FYI.

meta-arm recipe for optee already has correct LICENSE variable set so only the checksum needs to be modified once the LICENSE.md file changes are effective in an optee version update. These changes for meta-arm master branch where optee updates are ok and likely not for scarthgap LTS branch where only bug fixes should be applied.

Yes, Since the Commit currently being used in https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-test_4.2.0.bb#n3 is 526d5ba, It will work fine.

Got your point, Thanks. So this will be updated after 4.3.0 OP-TEE release, right?

Yes, after release and once meta-arm maintainers update optee (or we/anyone proposes the update to meta-arm).

@sahilnxp
Copy link
Contributor

sahilnxp commented Jul 3, 2024

Thanks @mikkorapeli-linaro @jforissier for quick response.

@jamesr jamesr deleted the add_license_text_issue_748 branch July 23, 2024 23:06
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.

License text (BSD/GPL) is not incorporated within this repository
5 participants