| Message ID | 20221102112854.49020-5-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fixing some licences issue in public headers | expand |
On 02.11.2022 12:28, Anthony PERARD wrote: > --- /dev/null > +++ b/tools/include/xen/COPYING > @@ -0,0 +1,26 @@ > +XEN NOTICE > +========== > + > +This licence applies to all files within this subdirectory ("/usr/include/xen") > +with the exception of "sys/" which may include an header under public domain or > +BSD-2 licence. Nit: s/an header/headers/ ? And perhaps better to not name the two licenses here but instead keep this more generic so it wouldn't need changing if a header with yet another license appeared? > +===================================================================== > + > +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 I understand you've simply copied this from ./COPYING, but shouldn't it be "limitation of" or "limiting"? Jan > +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.
On Wed, Nov 02, 2022 at 02:09:08PM +0100, Jan Beulich wrote: > On 02.11.2022 12:28, Anthony PERARD wrote: > > --- /dev/null > > +++ b/tools/include/xen/COPYING > > @@ -0,0 +1,26 @@ > > +XEN NOTICE > > +========== > > + > > +This licence applies to all files within this subdirectory ("/usr/include/xen") > > +with the exception of "sys/" which may include an header under public domain or > > +BSD-2 licence. > > Nit: s/an header/headers/ ? And perhaps better to not name the two licenses > here but instead keep this more generic so it wouldn't need changing if a > header with yet another license appeared? I guess I can make the text more generic without to much issue. As long as the exception is for the "sys/" headers, we would probably be fine. New change would be: +with the exception of "sys/" which may include headers under different +licences. > > +===================================================================== > > + > > +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 > > I understand you've simply copied this from ./COPYING, but shouldn't it be > "limitation of" or "limiting"? The text match the text at https://spdx.org/licenses/MIT.html, so I'm not going to change it. Thanks,
diff --git a/tools/include/Makefile b/tools/include/Makefile index 81c3d09039..f838171e8c 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -24,7 +24,6 @@ xen-foreign: xen-dir: mkdir -p xen/libelf acpi find xen/ acpi/ -type l -exec rm '{}' + - ln -s $(XEN_ROOT)/xen/include/public/COPYING xen/ ln -s $(XEN_ROOT)/xen/include/public/*.h xen/ ln -s $(XEN_ROOT)/xen/include/public/*/ xen/ ln -s ../xen-sys/$(XEN_OS) xen/sys diff --git a/tools/include/xen/COPYING b/tools/include/xen/COPYING new file mode 100644 index 0000000000..e54eb79832 --- /dev/null +++ b/tools/include/xen/COPYING @@ -0,0 +1,26 @@ +XEN NOTICE +========== + +This licence applies to all files within this subdirectory ("/usr/include/xen") +with the exception of "sys/" which may include an header under public domain or +BSD-2 licence. + +===================================================================== + +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.
The notice in the COPYING file in "xen/include/public/COPYING" doesn't really apply to the files that ultimately are been install at "/usr/include/xen". The issue are headers in the "sys/" subdirectory that comes from other projects such as Linux or FreeBSD. The main issue is that there are two headers that have a different licence than the MIT licence: - xen-sys/Linux/gntalloc.h (installed as "sys/gntalloc.h") is public domain. - xen-sys/FreeBSD/gntdev.h (installed as "sys/gntdev.h") is BSD-2. To clarify this, we'll install a COPYING file with a different notice. Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- Notes: CC: Andrew Cooper <andrew.cooper3@citrix.com> CC: George Dunlap <george.dunlap@citrix.com> CC: Jan Beulich <jbeulich@suse.com> CC: Julien Grall <julien@xen.org> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Wei Liu <wl@xen.org> tools/include/Makefile | 1 - tools/include/xen/COPYING | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tools/include/xen/COPYING