| Message ID | 20221103115204.49610-6-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixing some licences issue in public headers | expand |
On Thu, Nov 03, 2022 at 11:52:03AM +0000, Anthony PERARD wrote: > 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> > --- So the COPYING file is currently listed to be "ignored" by git (at least when untracked) and that seems to bother someone or something. So I guess an extra hunk to this patch is wanted: diff --git a/.gitignore b/.gitignore index 418bdfaebf..4eb602480a 100644 --- a/.gitignore +++ b/.gitignore @@ -195,6 +195,7 @@ tools/hotplug/NetBSD/rc.d/xendriverdomain tools/include/acpi tools/include/_libxl*.h tools/include/xen/* +!tools/include/xen/COPYING tools/include/xen-xsm/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker Cheers,
On 03/11/2022 11:52, Anthony PERARD wrote: > diff --git a/tools/include/xen/COPYING b/tools/include/xen/COPYING > new file mode 100644 > index 0000000000..fe3f9b7557 > --- /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") This wants to be $includedir, which means the file needs to be COPYING.in and processed by ./configure I'll see about spinning a new patch. ~Andrew
On 16/11/2022 15:26, Andrew Cooper wrote: > On 03/11/2022 11:52, Anthony PERARD wrote: >> diff --git a/tools/include/xen/COPYING b/tools/include/xen/COPYING >> new file mode 100644 >> index 0000000000..fe3f9b7557 >> --- /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") > This wants to be $includedir, which means the file needs to be > COPYING.in and processed by ./configure > > I'll see about spinning a new patch. FAOD, I've discarded this plan. Anthony points out that $includedir uses a shell variable so can't be processed by ./configure. If anyone actually notices, we can revisit fixing it when we're not in severe code freeze. ~Andrew
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..fe3f9b7557 --- /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 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 +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: v2: - change notice to be more generic and allow more headers and more licence exception without having to rewrite the notice. tools/include/Makefile | 1 - tools/include/xen/COPYING | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tools/include/xen/COPYING