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

Standardise license headers and copyright notices #153

Merged
merged 2 commits into from Jan 23, 2017

Conversation

mato
Copy link
Member

@mato mato commented Jan 23, 2017

This commit unifies the license headers and copyright notices in Solo5
and ukvm source files. Original source files use one of the following
standard headers:

For the Solo5 unikernel:

Copyright (c) 2015-2017 Contributors as noted in the AUTHORS file

This file is part of Solo5, a unikernel base layer.

For ukvm:

Copyright (c) 2015-2017 Contributors as noted in the AUTHORS file

This file is part of ukvm, a unikernel monitor.

The header is followed by the standard ISC license text.

Where a source file contains existing third-party licenses or copyright
notices these have been preserved and the Solo5 header has been added to
the top of the file.

Further, this commit updates the copyright notice in the top-level
LICENSE file to read:

Copyright (c) 2015-2017 Contributors as noted in the AUTHORS file

and adds a new AUTHORS file containing:

  1. copyright notices for corporate contributors,
  2. a list of individual contributor's names and their affiliation(s),
    if any.

I have populated the AUTHORS file with all contributors to date based on
the information in the git history.

@mato mato requested review from avsm and djwillia January 23, 2017 12:03
Madhuri Yechuri
Martin Lucina
Ricardo Koller
Waldir Pimenta
Copy link
Collaborator

Choose a reason for hiding this comment

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

This lgtm, with the refinement of adding any corporate affiliations after contributor's names in the "Individual Contributors" section above. My reasoning is that the copyright ownership rests with the corporate contributor in this case, and so it provides a mapping from committer to copyright owner in that case, but still leaves a suitable place for individual contributors to add their name too.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @avsm, this is a good idea. I've addressed it and re-pushed this as 07ab01f.

This commit unifies the license headers and copyright notices in Solo5
and ukvm source files. Original source files use one of the following
standard headers:

For the Solo5 unikernel:

    Copyright (c) 2015-2017 Contributors as noted in the AUTHORS file

    This file is part of Solo5, a unikernel base layer.

For ukvm:

    Copyright (c) 2015-2017 Contributors as noted in the AUTHORS file

    This file is part of ukvm, a unikernel monitor.

The header is followed by the standard ISC license text.

Where a source file contains existing third-party licenses or copyright
notices these have been preserved and the Solo5 header has been added to
the top of the file.

Further, this commit updates the copyright notice in the top-level
LICENSE file to read:

    Copyright (c) 2015-2017 Contributors as noted in the AUTHORS file

and adds a new AUTHORS file containing:

1. copyright notices for corporate contributors,
2. a list of individual contributor's names and their affiliation(s),
   if any.

I have populated the AUTHORS file with all contributors to date based on
the information in the git history.
The script is GPLv2 licensed and we're not using it anyway, so remove it
in favour of license clarity.
@djwillia djwillia merged commit 6e0e121 into Solo5:master Jan 23, 2017
@mato mato deleted the standard-licensing branch January 24, 2017 17:41
mato added a commit to mato/solo5 that referenced this pull request Feb 21, 2017
These two files fell through my `find` recipe for Solo5#153, fixing.
@mato mato mentioned this pull request Feb 21, 2017
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

3 participants