Message ID | 20190920003559.30292-1-jniethe5@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | ccan: Add CCAN heap license | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (470ffb5f29d741c3bed600f7bb7bf0cbb270e05a) |
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
On Fri, Sep 20, 2019 at 10:37 AM Jordan Niethe <jniethe5@gmail.com> wrote: > > In commit 3d6aca20b8ae ("ccan: Add CCAN heap source") the license file > is a symbolic link. The link points to the BSD-MIT license within the > CCAN project, but in skiboot this location does not exist. Replace the > link with the BSD-MIT license text. > > Signed-off-by: Jordan Niethe <jniethe5@gmail.com> merged as of trap_table_entry > --- > ccan/heap/LICENSE | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > mode change 120000 => 100644 ccan/heap/LICENSE > > diff --git a/ccan/heap/LICENSE b/ccan/heap/LICENSE > deleted file mode 120000 > index 2354d12945d3..000000000000 > --- a/ccan/heap/LICENSE > +++ /dev/null > @@ -1 +0,0 @@ > -../../licenses/BSD-MIT > \ No newline at end of file > diff --git a/ccan/heap/LICENSE b/ccan/heap/LICENSE > new file mode 100644 > index 000000000000..89de354795ec > --- /dev/null > +++ b/ccan/heap/LICENSE > @@ -0,0 +1,17 @@ > +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. > -- > 2.20.1 > > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot
On Thu, Oct 3, 2019 at 1:16 PM Oliver O'Halloran <oohall@gmail.com> wrote: > > On Fri, Sep 20, 2019 at 10:37 AM Jordan Niethe <jniethe5@gmail.com> wrote: > > > > In commit 3d6aca20b8ae ("ccan: Add CCAN heap source") the license file > > is a symbolic link. The link points to the BSD-MIT license within the > > CCAN project, but in skiboot this location does not exist. Replace the > > link with the BSD-MIT license text. > > > > Signed-off-by: Jordan Niethe <jniethe5@gmail.com> > > merged as of trap_table_entry 9f0af2799df6, stupid clipboard > > > --- > > ccan/heap/LICENSE | 18 +++++++++++++++++- > > 1 file changed, 17 insertions(+), 1 deletion(-) > > mode change 120000 => 100644 ccan/heap/LICENSE > > > > diff --git a/ccan/heap/LICENSE b/ccan/heap/LICENSE > > deleted file mode 120000 > > index 2354d12945d3..000000000000 > > --- a/ccan/heap/LICENSE > > +++ /dev/null > > @@ -1 +0,0 @@ > > -../../licenses/BSD-MIT > > \ No newline at end of file > > diff --git a/ccan/heap/LICENSE b/ccan/heap/LICENSE > > new file mode 100644 > > index 000000000000..89de354795ec > > --- /dev/null > > +++ b/ccan/heap/LICENSE > > @@ -0,0 +1,17 @@ > > +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. > > -- > > 2.20.1 > > > > _______________________________________________ > > Skiboot mailing list > > Skiboot@lists.ozlabs.org > > https://lists.ozlabs.org/listinfo/skiboot
diff --git a/ccan/heap/LICENSE b/ccan/heap/LICENSE deleted file mode 120000 index 2354d12945d3..000000000000 --- a/ccan/heap/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../licenses/BSD-MIT \ No newline at end of file diff --git a/ccan/heap/LICENSE b/ccan/heap/LICENSE new file mode 100644 index 000000000000..89de354795ec --- /dev/null +++ b/ccan/heap/LICENSE @@ -0,0 +1,17 @@ +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.
In commit 3d6aca20b8ae ("ccan: Add CCAN heap source") the license file is a symbolic link. The link points to the BSD-MIT license within the CCAN project, but in skiboot this location does not exist. Replace the link with the BSD-MIT license text. Signed-off-by: Jordan Niethe <jniethe5@gmail.com> --- ccan/heap/LICENSE | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) mode change 120000 => 100644 ccan/heap/LICENSE