[XEN PATCH for-4.17 0/4] Fixing some licences issue in public headers

[XEN PATCH for-4.17 0/4] Fixing some licences issue in public headers

[Anthony PERARD]

Patch series available in this git branch:
https://xenbits.xen.org/git-http/people/aperard/xen-unstable.git br.licences-fix-public-headers-v1

Hi,

Andrew pointed out some licences issue:

https://lore.kernel.org/xen-devel/b58f5340-d4fa-df9d-89de-6137005add77@citrix.com/T/#u
tracked here: https://gitlab.com/xen-project/xen/-/issues/35

So I attempt to fix them with this series.

For 4.17:
    This mostly change "documentation" so little risk for those patch, except
    "xen-foreign: Capture licences from the input headers" which changes
    "mkheader.py" which could generate broken headers.

Anthony PERARD (4):
  xen: Add licence information to public/errno.h
  tools/include/xen-foreign: Capture licences from the input headers
  xen: Add licence header to device_tree_defs.h
  Rework COPYING installed in /usr/include/xen/, due to several licences

 tools/include/Makefile                |  1 -
 xen/include/public/device_tree_defs.h |  6 ++++++
 xen/include/public/errno.h            |  2 ++
 tools/include/xen-foreign/mkheader.py | 15 +++++++++++++--
 tools/include/xen/COPYING             | 26 ++++++++++++++++++++++++++
 5 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 tools/include/xen/COPYING

-- 
Anthony PERARD

[XEN PATCH for-4.17 1/4] xen: Add licence information to public/errno.h

[Anthony PERARD]

Fixes: 81f559e97974 ("make error codes a formal part of the ABI")
Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 xen/include/public/errno.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/include/public/errno.h b/xen/include/public/errno.h
index 5c53af6af9..6bdc8c5079 100644
--- a/xen/include/public/errno.h
+++ b/xen/include/public/errno.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: MIT */
+
 /*
  * There are two expected ways of including this header.
  *
-- 
Anthony PERARD

[XEN PATCH for-4.17 2/4] tools/include/xen-foreign: Capture licences from the input headers

[Anthony PERARD]

The headers install in "/usr/include/xen/foreign/" are missing a
licence.

While we could probably just add the MIT licence to the generated
file, this patch instead try to grab the licence from the original
input file.

Since licences are in the first multiline C comments, we just look for
that. Also with this patch, the possible licences will not be in the
"input" variable anymore, but it should be unnecessary to generate the
foreign header.

With this change, the licence will be copied 2 or 3 time in the
install headers depending on the number of input headers.

Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---

Notes:
    Maybe instead of this, we should just stamp this on the generated header
        /* SPDX-License-Identifier: MIT */
    
    but we would be missing the "Copyright" informations. I guess we could
    look for those line with Copyright and copy them.
    
    Or, we could replace the licence in the input header by a SPDX and have
    the script parse that. (Probably still need to grab the Copyright lines)
    
    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/xen-foreign/mkheader.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/include/xen-foreign/mkheader.py b/tools/include/xen-foreign/mkheader.py
index fb268f0dce..07a9bcbd01 100644
--- a/tools/include/xen-foreign/mkheader.py
+++ b/tools/include/xen-foreign/mkheader.py
@@ -114,9 +114,19 @@ input  = "";
 output = "";
 fileid = re.sub("[-.]", "_", "__FOREIGN_%s__" % outfile.upper());
 
-# read input header files
+# Try to captures licences headers from original files.
+# heuristic: just look for the end of the first multiline comment.
+licence_headers = "";
+
 for name in infiles:
     f = open(name, "r");
+    while True:
+        line = f.readline()
+        if not line:
+            break
+        licence_headers += line
+        if line == " */\n":
+            break
     input += f.read();
     f.close();
 
@@ -126,11 +136,12 @@ output += """
  * public xen defines and struct for %s
  * generated by %s -- DO NOT EDIT
  */
+%s
 
 #ifndef %s
 #define %s 1
 
-""" % (arch, sys.argv[0], fileid, fileid)
+""" % (arch, sys.argv[0], licence_headers, fileid, fileid)
 
 if arch in header:
     output += header[arch];
-- 
Anthony PERARD

[XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

[Anthony PERARD]

This header have been created by moving code from other part of the
project and miss a licence header. The original source code was some
version of GPL or LGPL but we intend to have the public header to be
MIT so they can be included easily in other projects.

Part of device_tree_defs.h were moved from libxl_arm.c which is
LGPL-2.1-only. And part were moved from device_tree.h that is
GPL-2.0-only.

Part of the original code were added by Julien Grall @ Citrix with a
Linaro "hat" in commits c3ba52a84dd8 and 405c167f0ec9 and
886f34045bf0. The other part were added by Ian Campbell @ Citrix, with
commit 0c64527e7fc9.

Resolves: xen-project/xen#35
Fixes: 1c898a9fec7e ("xen/arm: move a few DT related defines to public/device_tree_defs.h")
Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---

Notes:
    Julian was working @citrix until 2015.

 xen/include/public/device_tree_defs.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xen/include/public/device_tree_defs.h b/xen/include/public/device_tree_defs.h
index 228daafe81..9e80d0499d 100644
--- a/xen/include/public/device_tree_defs.h
+++ b/xen/include/public/device_tree_defs.h
@@ -1,3 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright (c) 2013 Linaro Limited
+ * Copyright (c) 2015 Citrix Systems, Inc
+ */
+
 #ifndef __XEN_DEVICE_TREE_DEFS_H__
 #define __XEN_DEVICE_TREE_DEFS_H__
 
-- 
Anthony PERARD

[XEN PATCH for-4.17 4/4] Rework COPYING installed in /usr/include/xen/, due to several licences

[Anthony PERARD]

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

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.
-- 
Anthony PERARD

Re: [XEN PATCH for-4.17 2/4] tools/include/xen-foreign: Capture licences from the input headers

[Andrew Cooper]

On 02/11/2022 11:28, Anthony PERARD wrote:
> The headers install in "/usr/include/xen/foreign/" are missing a
> licence.
>
> While we could probably just add the MIT licence to the generated
> file, this patch instead try to grab the licence from the original
> input file.
>
> Since licences are in the first multiline C comments, we just look for
> that. Also with this patch, the possible licences will not be in the
> "input" variable anymore, but it should be unnecessary to generate the
> foreign header.
>
> With this change, the licence will be copied 2 or 3 time in the
> install headers depending on the number of input headers.
>
> Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>
> Notes:
>     Maybe instead of this, we should just stamp this on the generated header
>         /* SPDX-License-Identifier: MIT */
>     
>     but we would be missing the "Copyright" informations. I guess we could
>     look for those line with Copyright and copy them.
>     
>     Or, we could replace the licence in the input header by a SPDX and have
>     the script parse that. (Probably still need to grab the Copyright lines)

All public headers (except one :-( ) are MIT.

We should SPDX the lot, not least because that removes all the
guestimation from this script; we can require that the SPDX line is the
first line, and sanity check it as we process it.

The headers also ought to say "automatically generated from $OTHER", and
include no other information.  That's now most autogen headers work.

So the generated files ought to end up looking like:

/* SPDX-License-Identifier: MIT */
/* Automatically generated from $FILE */

#ifndef $BLAH
...

~Andrew

Re: [XEN PATCH for-4.17 1/4] xen: Add licence information to public/errno.h

[Jan Beulich]

On 02.11.2022 12:28, Anthony PERARD wrote:
> Fixes: 81f559e97974 ("make error codes a formal part of the ABI")
> Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>  xen/include/public/errno.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/xen/include/public/errno.h b/xen/include/public/errno.h
> index 5c53af6af9..6bdc8c5079 100644
> --- a/xen/include/public/errno.h
> +++ b/xen/include/public/errno.h
> @@ -1,3 +1,5 @@
> +/* SPDX-License-Identifier: MIT */
> +
>  /*
>   * There are two expected ways of including this header.
>   *

Doesn't this require at least part of Stefano's "[PATCH v4 0/4] introduce
SPDX" as a prereq? I notice quite a few files already use leading SPDX
comments, but perhaps wrongly so without it being explained anywhere in
tree what this is about?

Jan

Re: [XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

[Andrew Cooper]

On 02/11/2022 11:28, Anthony PERARD wrote:
> This header have been created by moving code from other part of the
> project and miss a licence header. The original source code was some
> version of GPL or LGPL but we intend to have the public header to be
> MIT so they can be included easily in other projects.
>
> Part of device_tree_defs.h were moved from libxl_arm.c which is
> LGPL-2.1-only. And part were moved from device_tree.h that is
> GPL-2.0-only.
>
> Part of the original code were added by Julien Grall @ Citrix with a
> Linaro "hat" in commits c3ba52a84dd8 and 405c167f0ec9 and
> 886f34045bf0. The other part were added by Ian Campbell @ Citrix, with
> commit 0c64527e7fc9.
>
> Resolves: xen-project/xen#35
> Fixes: 1c898a9fec7e ("xen/arm: move a few DT related defines to public/device_tree_defs.h")
> Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

I've checked with relevant people.  Citrix is happy for this to be
relicensed as proposed.

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [XEN PATCH for-4.17 4/4] Rework COPYING installed in /usr/include/xen/, due to several licences

[Jan Beulich]

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.

Re: [XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

[Julien Grall]

Hi,

On 02/11/2022 11:28, Anthony PERARD wrote:
> This header have been created by moving code from other part of the
> project and miss a licence header. The original source code was some
> version of GPL or LGPL but we intend to have the public header to be
> MIT so they can be included easily in other projects.
> 
> Part of device_tree_defs.h were moved from libxl_arm.c which is
> LGPL-2.1-only. And part were moved from device_tree.h that is
> GPL-2.0-only.
> 
> Part of the original code were added by Julien Grall @ Citrix with a
> Linaro "hat" in commits c3ba52a84dd8 and 405c167f0ec9 and
> 886f34045bf0.

 From this comment it is not entirely who you think the copyright owner 
is. IIRC, part of the agreement was that all code written with my Linaro 
"hat" would be copyrighted by Linaro rather than Citrix.

So I think we would need Linaro's agreement for the relicensing.

Cheers,

-- 
Julien Grall

Re: [XEN PATCH for-4.17 2/4] tools/include/xen-foreign: Capture licences from the input headers

[Anthony PERARD]

On Wed, Nov 02, 2022 at 12:24:21PM +0000, Andrew Cooper wrote:
> On 02/11/2022 11:28, Anthony PERARD wrote:
> > Notes:
> >     Maybe instead of this, we should just stamp this on the generated header
> >         /* SPDX-License-Identifier: MIT */
> >     
> >     but we would be missing the "Copyright" informations. I guess we could
> >     look for those line with Copyright and copy them.
> >     
> >     Or, we could replace the licence in the input header by a SPDX and have
> >     the script parse that. (Probably still need to grab the Copyright lines)
> 
> All public headers (except one :-( ) are MIT.
>
> We should SPDX the lot, not least because that removes all the
> guestimation from this script; we can require that the SPDX line is the
> first line, and sanity check it as we process it.

Yes, but I'm not sure I want to do the SPDX change when the tree is
supposed to be frozen.

> The headers also ought to say "automatically generated from $OTHER", and
> include no other information.  That's now most autogen headers work.
> 
> So the generated files ought to end up looking like:
> 
> /* SPDX-License-Identifier: MIT */
> /* Automatically generated from $FILE */

So the headers already have:
    /*
     * public xen defines and struct for arm32
     * generated by mkheader.py -- DO NOT EDIT
     */

So we just miss the source files used as input by mkheader.py. I can fix
that.

Thanks,

-- 
Anthony PERARD

Re: [XEN PATCH for-4.17 1/4] xen: Add licence information to public/errno.h

[Anthony PERARD]

On Wed, Nov 02, 2022 at 01:58:11PM +0100, Jan Beulich wrote:
> On 02.11.2022 12:28, Anthony PERARD wrote:
> > Fixes: 81f559e97974 ("make error codes a formal part of the ABI")
> > Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> > ---
> >  xen/include/public/errno.h | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/xen/include/public/errno.h b/xen/include/public/errno.h
> > index 5c53af6af9..6bdc8c5079 100644
> > --- a/xen/include/public/errno.h
> > +++ b/xen/include/public/errno.h
> > @@ -1,3 +1,5 @@
> > +/* SPDX-License-Identifier: MIT */
> > +
> >  /*
> >   * There are two expected ways of including this header.
> >   *
> 
> Doesn't this require at least part of Stefano's "[PATCH v4 0/4] introduce
> SPDX" as a prereq? I notice quite a few files already use leading SPDX
> comments, but perhaps wrongly so without it being explained anywhere in
> tree what this is about?

I don't think Stefano's work is required or needed, beside pointing out
that new file should use SPDX, and providing guidelines.

It seems that using the SPDX identifier in a project without explanation
is enough. It could be seen as a useless comment if not understood (but
useful for some tools) and in this case the COPYING files (in our case)
would tell the licence been used.

But, if used, "SPDX-License-Identifier: MIT" have a very specific
meaning, it means that the licence used in question is
https://spdx.org/licenses/MIT.html, and Stefano's work shouldn't change
that meaning.

Thanks,

-- 
Anthony PERARD

Re: [XEN PATCH for-4.17 4/4] Rework COPYING installed in /usr/include/xen/, due to several licences

[Anthony PERARD]

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,

-- 
Anthony PERARD

Re: [XEN PATCH for-4.17 2/4] tools/include/xen-foreign: Capture licences from the input headers

[Andrew Cooper]

On 02/11/2022 15:14, Anthony PERARD wrote:
> On Wed, Nov 02, 2022 at 12:24:21PM +0000, Andrew Cooper wrote:
>> On 02/11/2022 11:28, Anthony PERARD wrote:
>>> Notes:
>>>     Maybe instead of this, we should just stamp this on the generated header
>>>         /* SPDX-License-Identifier: MIT */
>>>     
>>>     but we would be missing the "Copyright" informations. I guess we could
>>>     look for those line with Copyright and copy them.
>>>     
>>>     Or, we could replace the licence in the input header by a SPDX and have
>>>     the script parse that. (Probably still need to grab the Copyright lines)
>> All public headers (except one :-( ) are MIT.
>>
>> We should SPDX the lot, not least because that removes all the
>> guestimation from this script; we can require that the SPDX line is the
>> first line, and sanity check it as we process it.
> Yes, but I'm not sure I want to do the SPDX change when the tree is
> supposed to be frozen.

The licensing corrections are a release blocker.

The frozenness of the tree has no bearing on the acceptableness of the
fix.  Especially when all we're talking about is adjustment of some
(legally-relevant) comments.

In this case, switching to a more machine-parsable form, in order to get
the autogeneration correct, is IMO fully acceptable even at this point
in the release.

~Andrew

Re: [XEN PATCH for-4.17 1/4] xen: Add licence information to public/errno.h

[Andrew Cooper]

On 02/11/2022 12:58, Jan Beulich wrote:
> On 02.11.2022 12:28, Anthony PERARD wrote:
>> Fixes: 81f559e97974 ("make error codes a formal part of the ABI")
>> Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
>> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
>> ---
>>  xen/include/public/errno.h | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/xen/include/public/errno.h b/xen/include/public/errno.h
>> index 5c53af6af9..6bdc8c5079 100644
>> --- a/xen/include/public/errno.h
>> +++ b/xen/include/public/errno.h
>> @@ -1,3 +1,5 @@
>> +/* SPDX-License-Identifier: MIT */
>> +
>>  /*
>>   * There are two expected ways of including this header.
>>   *
> Doesn't this require at least part of Stefano's "[PATCH v4 0/4] introduce
> SPDX" as a prereq?

No.

A retroactive commentary on SPDX tags doesn't change the validity of the
tags themselves, nor the fact they've been a specifically agreed thing
for years now (considering it was Lars who settled the SPDX debate with
an explicit yes).

~Andrew

Re: [XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

[Anthony PERARD]

On Wed, Nov 02, 2022 at 01:16:04PM +0000, Julien Grall wrote:
> Hi,
> 
> On 02/11/2022 11:28, Anthony PERARD wrote:
> > This header have been created by moving code from other part of the
> > project and miss a licence header. The original source code was some
> > version of GPL or LGPL but we intend to have the public header to be
> > MIT so they can be included easily in other projects.
> > 
> > Part of device_tree_defs.h were moved from libxl_arm.c which is
> > LGPL-2.1-only. And part were moved from device_tree.h that is
> > GPL-2.0-only.
> > 
> > Part of the original code were added by Julien Grall @ Citrix with a
> > Linaro "hat" in commits c3ba52a84dd8 and 405c167f0ec9 and
> > 886f34045bf0.
> 
> From this comment it is not entirely who you think the copyright owner is.

That's because I'm not sure.

> IIRC, part of the agreement was that all code written with my Linaro "hat"
> would be copyrighted by Linaro rather than Citrix.
>
> So I think we would need Linaro's agreement for the relicensing.

Sounds good to me.

Cheers,

-- 
Anthony PERARD

Re: [XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

[Bertrand Marquis]

Hi,

+Grant Likely from Linaro.

In the following change, we need to change the license to MIT (from GPL) of one of Xen public headers which has a Linaro copyright.

@Grant Likely: could you confirm that Linaro is agreeing for Xen Project to do such a change ?

Kind regards
Bertrand Marquis

> On 2 Nov 2022, at 11:28, Anthony PERARD <anthony.perard@citrix.com> wrote:
> 
> This header have been created by moving code from other part of the
> project and miss a licence header. The original source code was some
> version of GPL or LGPL but we intend to have the public header to be
> MIT so they can be included easily in other projects.
> 
> Part of device_tree_defs.h were moved from libxl_arm.c which is
> LGPL-2.1-only. And part were moved from device_tree.h that is
> GPL-2.0-only.
> 
> Part of the original code were added by Julien Grall @ Citrix with a
> Linaro "hat" in commits c3ba52a84dd8 and 405c167f0ec9 and
> 886f34045bf0. The other part were added by Ian Campbell @ Citrix, with
> commit 0c64527e7fc9.
> 
> Resolves: xen-project/xen#35
> Fixes: 1c898a9fec7e ("xen/arm: move a few DT related defines to public/device_tree_defs.h")
> Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
> 
> Notes:
>    Julian was working @citrix until 2015.
> 
> xen/include/public/device_tree_defs.h | 6 ++++++
> 1 file changed, 6 insertions(+)
> 
> diff --git a/xen/include/public/device_tree_defs.h b/xen/include/public/device_tree_defs.h
> index 228daafe81..9e80d0499d 100644
> --- a/xen/include/public/device_tree_defs.h
> +++ b/xen/include/public/device_tree_defs.h
> @@ -1,3 +1,9 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright (c) 2013 Linaro Limited
> + * Copyright (c) 2015 Citrix Systems, Inc
> + */
> +
> #ifndef __XEN_DEVICE_TREE_DEFS_H__
> #define __XEN_DEVICE_TREE_DEFS_H__
> 
> -- 
> Anthony PERARD
> 
> 

Re: [XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

[Grant Likely]

[-- Attachment #1: Type: text/plain, Size: 2242 bytes --]

Linaro approves the license change

Acked-by: Grant Likely <grant.likely@linaro.org <mailto:grant.likely@linaro.org>>

> On 11 Nov 2022, at 13:51, Bertrand Marquis <Bertrand.Marquis@arm.com> wrote:
> 
> Hi,
> 
> +Grant Likely from Linaro.
> 
> In the following change, we need to change the license to MIT (from GPL) of one of Xen public headers which has a Linaro copyright.
> 
> @Grant Likely: could you confirm that Linaro is agreeing for Xen Project to do such a change ?
> 
> Kind regards
> Bertrand Marquis
> 
>> On 2 Nov 2022, at 11:28, Anthony PERARD <anthony.perard@citrix.com> wrote:
>> 
>> This header have been created by moving code from other part of the
>> project and miss a licence header. The original source code was some
>> version of GPL or LGPL but we intend to have the public header to be
>> MIT so they can be included easily in other projects.
>> 
>> Part of device_tree_defs.h were moved from libxl_arm.c which is
>> LGPL-2.1-only. And part were moved from device_tree.h that is
>> GPL-2.0-only.
>> 
>> Part of the original code were added by Julien Grall @ Citrix with a
>> Linaro "hat" in commits c3ba52a84dd8 and 405c167f0ec9 and
>> 886f34045bf0. The other part were added by Ian Campbell @ Citrix, with
>> commit 0c64527e7fc9.
>> 
>> Resolves: xen-project/xen#35
>> Fixes: 1c898a9fec7e ("xen/arm: move a few DT related defines to public/device_tree_defs.h")
>> Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com>
>> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
>> ---
>> 
>> Notes:
>>   Julian was working @citrix until 2015.
>> 
>> xen/include/public/device_tree_defs.h | 6 ++++++
>> 1 file changed, 6 insertions(+)
>> 
>> diff --git a/xen/include/public/device_tree_defs.h b/xen/include/public/device_tree_defs.h
>> index 228daafe81..9e80d0499d 100644
>> --- a/xen/include/public/device_tree_defs.h
>> +++ b/xen/include/public/device_tree_defs.h
>> @@ -1,3 +1,9 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright (c) 2013 Linaro Limited
>> + * Copyright (c) 2015 Citrix Systems, Inc
>> + */
>> +
>> #ifndef __XEN_DEVICE_TREE_DEFS_H__
>> #define __XEN_DEVICE_TREE_DEFS_H__
>> 
>> -- 
>> Anthony PERARD
>> 
>> 
> 


[-- Attachment #2: Type: text/html, Size: 2666 bytes --]

RE: [XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

[Henry Wang]

[-- Attachment #1: Type: text/plain, Size: 3022 bytes --]

Hi Grant,

Great thanks for the confirmation! This would timely resolve one of the release blocker for the Xen 4.17 release :)

Kind regards,
Henry

From: Grant Likely <grant.likely@linaro.org>
Sent: Wednesday, November 16, 2022 12:08 AM
To: Bertrand Marquis <Bertrand.Marquis@arm.com>
Cc: Anthony PERARD <anthony.perard@citrix.com>; Xen developer discussion <xen-devel@lists.xenproject.org>; Henry Wang <Henry.Wang@arm.com>; Andrew Cooper <Andrew.Cooper3@citrix.com>; George Dunlap <george.dunlap@citrix.com>; Jan Beulich <jbeulich@suse.com>; Julien Grall <julien@xen.org>; Stefano Stabellini <sstabellini@kernel.org>; Wei Liu <wl@xen.org>; Andrew Wafaa <Andrew.Wafaa@arm.com>; Robert Booth <rob.booth@linaro.org>
Subject: Re: [XEN PATCH for-4.17 3/4] xen: Add licence header to device_tree_defs.h

Linaro approves the license change

Acked-by: Grant Likely <grant.likely@linaro.org<mailto:grant.likely@linaro.org>>

On 11 Nov 2022, at 13:51, Bertrand Marquis <Bertrand.Marquis@arm.com<mailto:Bertrand.Marquis@arm.com>> wrote:

Hi,

+Grant Likely from Linaro.

In the following change, we need to change the license to MIT (from GPL) of one of Xen public headers which has a Linaro copyright.

@Grant Likely: could you confirm that Linaro is agreeing for Xen Project to do such a change ?

Kind regards
Bertrand Marquis


On 2 Nov 2022, at 11:28, Anthony PERARD <anthony.perard@citrix.com<mailto:anthony.perard@citrix.com>> wrote:

This header have been created by moving code from other part of the
project and miss a licence header. The original source code was some
version of GPL or LGPL but we intend to have the public header to be
MIT so they can be included easily in other projects.

Part of device_tree_defs.h were moved from libxl_arm.c which is
LGPL-2.1-only. And part were moved from device_tree.h that is
GPL-2.0-only.

Part of the original code were added by Julien Grall @ Citrix with a
Linaro "hat" in commits c3ba52a84dd8 and 405c167f0ec9 and
886f34045bf0. The other part were added by Ian Campbell @ Citrix, with
commit 0c64527e7fc9.

Resolves: xen-project/xen#35
Fixes: 1c898a9fec7e ("xen/arm: move a few DT related defines to public/device_tree_defs.h")
Reported-by: Andrew Cooper <Andrew.Cooper3@citrix.com<mailto:Andrew.Cooper3@citrix.com>>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com<mailto:anthony.perard@citrix.com>>
---

Notes:
  Julian was working @citrix until 2015.

xen/include/public/device_tree_defs.h | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/xen/include/public/device_tree_defs.h b/xen/include/public/device_tree_defs.h
index 228daafe81..9e80d0499d 100644
--- a/xen/include/public/device_tree_defs.h
+++ b/xen/include/public/device_tree_defs.h
@@ -1,3 +1,9 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright (c) 2013 Linaro Limited
+ * Copyright (c) 2015 Citrix Systems, Inc
+ */
+
#ifndef __XEN_DEVICE_TREE_DEFS_H__
#define __XEN_DEVICE_TREE_DEFS_H__

--
Anthony PERARD




[-- Attachment #2: Type: text/html, Size: 6401 bytes --]