clarify other licenses in LICENSES/

clarify other licenses in LICENSES/

[Christoph Hellwig]

Hi all,

this series splits the others category into dual or deprecated,
and also fixes up some other minor bits in the documentation for
these non-preferred licenses.

[PATCH 1/3] docs: Don't reference the ZLib license in license-rules.rst

[Christoph Hellwig]

We never had a file called LICENSES/other/ZLib in the tree, so don't
reference it.  Instead mention the GPL v1 as an (bad) example.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 Documentation/process/license-rules.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst
index 6b09033a8e9e..ade495fe6811 100644
--- a/Documentation/process/license-rules.rst
+++ b/Documentation/process/license-rules.rst
@@ -255,9 +255,9 @@ kernel, can be broken down into:
    Contains the Internet Systems Consortium license text and the required
    metatags::
 
-      LICENSES/other/ZLib
+      LICENSES/other/GPL-1.0
 
-   Contains the ZLIB license text and the required metatags.
+   Contains the GPL version 1 license text and the required metatags.
 
    Metatags:
 
-- 
2.20.1

[PATCH 2/3] LICENSES: Clearly mark dual license only licenses

[Christoph Hellwig]

Just like the CDDL the Apache license and the MPL must only be used as
a choice in additional to an GPL2 compatible license.  Copy over the
boilerplate from the CDDL file to the other two after fixing it up to
make it clear the licenses need to be GPL2 compatible, not just the
more generic GPL compatible.  For example the Apache 2 license is GPL3
compatible, but that doesn't matter for the kernel.

Also move these licenses to a separate directory and document the rules
in license-rules.rst.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 Documentation/process/license-rules.rst | 51 ++++++++++++++++++++++++-
 LICENSES/{other => dual}/Apache-2.0     |  4 ++
 LICENSES/{other => dual}/CDDL-1.0       |  4 +-
 LICENSES/{other => dual}/MPL-1.1        |  4 ++
 4 files changed, 60 insertions(+), 3 deletions(-)
 rename LICENSES/{other => dual}/Apache-2.0 (97%)
 rename LICENSES/{other => dual}/CDDL-1.0 (99%)
 rename LICENSES/{other => dual}/MPL-1.1 (99%)

diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst
index ade495fe6811..507b695fa9da 100644
--- a/Documentation/process/license-rules.rst
+++ b/Documentation/process/license-rules.rst
@@ -281,7 +281,56 @@ kernel, can be broken down into:
 
 |
 
-3. _`Exceptions`:
+3. Dual Licensing Only
+
+   These licenses should only be used to dual license code with another
+   license in addition to a preferred license.  These licenses are available
+   from the directory::
+
+      LICENSES/dual/
+
+   in the kernel source tree.
+
+   The files in this directory contain the full license text and
+   `Metatags`_.  The file names are identical to the SPDX license
+   identifier which shall be used for the license in source files.
+
+   Examples::
+
+      LICENSES/dual/MPL-1.1
+
+   Contains the Mozilla Public License version 1.1 license text and the
+   required metatags::
+
+      LICENSES/dual/Apache-2.0
+
+   Contains the Apache License version 2.0 license text and the required
+   metatags.
+
+   Metatags:
+
+   The metatag requirements for 'other' licenses are identical to the
+   requirements of the `Preferred licenses`_.
+
+   File format example::
+
+      Valid-License-Identifier: MPL-1.1
+      SPDX-URL: https://spdx.org/licenses/MPL-1.1.html
+      Usage-Guide:
+        Do NOT use. The MPL-1.1 is not GPL2 compatible. It may only be used for
+        dual-licensed files where the other license is GPL2 compatible.
+        If you end up using this it MUST be used together with a GPL2 compatible
+        license using "OR".
+        To use the Mozilla Public License version 1.1 put the following SPDX
+        tag/value pair into a comment according to the placement guidelines in
+        the licensing rules documentation:
+      SPDX-License-Identifier: MPL-1.1
+      License-Text:
+        Full license text
+
+|
+
+4. _`Exceptions`:
 
    Some licenses can be amended with exceptions which grant certain rights
    which the original license does not.  These exceptions are available
diff --git a/LICENSES/other/Apache-2.0 b/LICENSES/dual/Apache-2.0
similarity index 97%
rename from LICENSES/other/Apache-2.0
rename to LICENSES/dual/Apache-2.0
index 7cd903f573e5..6e89ddeab187 100644
--- a/LICENSES/other/Apache-2.0
+++ b/LICENSES/dual/Apache-2.0
@@ -1,6 +1,10 @@
 Valid-License-Identifier: Apache-2.0
 SPDX-URL: https://spdx.org/licenses/Apache-2.0.html
 Usage-Guide:
+  Do NOT use. The Apache-2.0 is not GPL2 compatible. It may only be used
+  for dual-licensed files where the other license is GPL2 compatible.
+  If you end up using this it MUST be used together with a GPL2 compatible
+  license using "OR".
   To use the Apache License version 2.0 put the following SPDX tag/value
   pair into a comment according to the placement guidelines in the
   licensing rules documentation:
diff --git a/LICENSES/other/CDDL-1.0 b/LICENSES/dual/CDDL-1.0
similarity index 99%
rename from LICENSES/other/CDDL-1.0
rename to LICENSES/dual/CDDL-1.0
index 25f614276ddd..b0ca1016db79 100644
--- a/LICENSES/other/CDDL-1.0
+++ b/LICENSES/dual/CDDL-1.0
@@ -1,8 +1,8 @@
 Valid-License-Identifier: CDDL-1.0
 SPDX-URL: https://spdx.org/licenses/CDDL-1.0.html
 Usage-Guide:
-  Do NOT use. The CDDL-1.0 is not GPL compatible. It may only be used for
-  dual-licensed files where the other license is GPL compatible.
+  Do NOT use. The CDDL-1.0 is not GPL2 compatible. It may only be used for
+  dual-licensed files where the other license is GPL2 compatible.
   If you end up using this it MUST be used together with a GPL2 compatible
   license using "OR".
   To use the Common Development and Distribution License 1.0 put the
diff --git a/LICENSES/other/MPL-1.1 b/LICENSES/dual/MPL-1.1
similarity index 99%
rename from LICENSES/other/MPL-1.1
rename to LICENSES/dual/MPL-1.1
index 568b6049efe6..61706859e1b2 100644
--- a/LICENSES/other/MPL-1.1
+++ b/LICENSES/dual/MPL-1.1
@@ -1,6 +1,10 @@
 Valid-License-Identifier: MPL-1.1
 SPDX-URL: https://spdx.org/licenses/MPL-1.1.html
 Usage-Guide:
+  Do NOT use. The MPL-1.1 is not GPL2 compatible. It may only be used for
+  dual-licensed files where the other license is GPL2 compatible.
+  If you end up using this it MUST be used together with a GPL2 compatible
+  license using "OR".
   To use the Mozilla Public License version 1.1 put the following SPDX
   tag/value pair into a comment according to the placement guidelines in
   the licensing rules documentation:
-- 
2.20.1

[PATCH 3/3] LICENSES: Rename other to deprecated

[Christoph Hellwig]

Make it clear in the directory name that these are not intended for new
code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 Documentation/process/license-rules.rst     | 8 ++++----
 LICENSES/{other => deprecated}/GPL-1.0      | 0
 LICENSES/{other => deprecated}/ISC          | 0
 LICENSES/{other => deprecated}/Linux-OpenIB | 0
 LICENSES/{other => deprecated}/X11          | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename LICENSES/{other => deprecated}/GPL-1.0 (100%)
 rename LICENSES/{other => deprecated}/ISC (100%)
 rename LICENSES/{other => deprecated}/Linux-OpenIB (100%)
 rename LICENSES/{other => deprecated}/X11 (100%)

diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst
index 507b695fa9da..2ef44ada3f11 100644
--- a/Documentation/process/license-rules.rst
+++ b/Documentation/process/license-rules.rst
@@ -234,13 +234,13 @@ kernel, can be broken down into:
 
 |
 
-2. Not recommended licenses:
+2. Deprecated licenses:
 
    These licenses should only be used for existing code or for importing
    code from a different project.  These licenses are available from the
    directory::
 
-      LICENSES/other/
+      LICENSES/deprecated/
 
    in the kernel source tree.
 
@@ -250,12 +250,12 @@ kernel, can be broken down into:
 
    Examples::
 
-      LICENSES/other/ISC
+      LICENSES/deprecated/ISC
 
    Contains the Internet Systems Consortium license text and the required
    metatags::
 
-      LICENSES/other/GPL-1.0
+      LICENSES/deprecated/GPL-1.0
 
    Contains the GPL version 1 license text and the required metatags.
 
diff --git a/LICENSES/other/GPL-1.0 b/LICENSES/deprecated/GPL-1.0
similarity index 100%
rename from LICENSES/other/GPL-1.0
rename to LICENSES/deprecated/GPL-1.0
diff --git a/LICENSES/other/ISC b/LICENSES/deprecated/ISC
similarity index 100%
rename from LICENSES/other/ISC
rename to LICENSES/deprecated/ISC
diff --git a/LICENSES/other/Linux-OpenIB b/LICENSES/deprecated/Linux-OpenIB
similarity index 100%
rename from LICENSES/other/Linux-OpenIB
rename to LICENSES/deprecated/Linux-OpenIB
diff --git a/LICENSES/other/X11 b/LICENSES/deprecated/X11
similarity index 100%
rename from LICENSES/other/X11
rename to LICENSES/deprecated/X11
-- 
2.20.1

Re: clarify other licenses in LICENSES/

[Greg Kroah-Hartman]

On Tue, Apr 30, 2019 at 06:51:27AM -0400, Christoph Hellwig wrote:
> Hi all,
> 
> this series splits the others category into dual or deprecated,
> and also fixes up some other minor bits in the documentation for
> these non-preferred licenses.

Looks good to me, thanks for doing this!

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: clarify other licenses in LICENSES/

[Jonathan Corbet]

On Tue, 30 Apr 2019 13:41:34 +0200
Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:

> On Tue, Apr 30, 2019 at 06:51:27AM -0400, Christoph Hellwig wrote:
> > Hi all,
> > 
> > this series splits the others category into dual or deprecated,
> > and also fixes up some other minor bits in the documentation for
> > these non-preferred licenses.  
> 
> Looks good to me, thanks for doing this!
> 
> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

I've applied the set, thanks.

jon

Re: [PATCH 3/3] LICENSES: Rename other to deprecated

[Borislav Petkov]

On Tue, Apr 30, 2019 at 06:51:30AM -0400, Christoph Hellwig wrote:
> Make it clear in the directory name that these are not intended for new
> code.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  Documentation/process/license-rules.rst     | 8 ++++----
>  LICENSES/{other => deprecated}/GPL-1.0      | 0
>  LICENSES/{other => deprecated}/ISC          | 0
>  LICENSES/{other => deprecated}/Linux-OpenIB | 0
>  LICENSES/{other => deprecated}/X11          | 0
>  5 files changed, 4 insertions(+), 4 deletions(-)
>  rename LICENSES/{other => deprecated}/GPL-1.0 (100%)
>  rename LICENSES/{other => deprecated}/ISC (100%)
>  rename LICENSES/{other => deprecated}/Linux-OpenIB (100%)
>  rename LICENSES/{other => deprecated}/X11 (100%)

This breaks scripts/spdxcheck.py, it needs below hunk. Also, should
"dual" be added to license_dirs too?

diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 4fe392e507fb..1a39b34588b7 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -32,7 +32,7 @@ class SPDXdata(object):
 def read_spdxdata(repo):
 
     # The subdirectories of LICENSES in the kernel source
-    license_dirs = [ "preferred", "other", "exceptions" ]
+    license_dirs = [ "preferred", "deprecated", "exceptions" ]
     lictree = repo.head.commit.tree['LICENSES']
 
     spdx = SPDXdata()

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.

Re: [PATCH 3/3] LICENSES: Rename other to deprecated

[Christoph Hellwig]

On Tue, May 14, 2019 at 12:26:32PM +0200, Borislav Petkov wrote:
> This breaks scripts/spdxcheck.py, it needs below hunk. Also, should
> "dual" be added to license_dirs too?

Yes.  In fact two people already submitted patches for that before
you, just waiting for them to get picked up.

Re: [PATCH 3/3] LICENSES: Rename other to deprecated

[Borislav Petkov]

On Tue, May 14, 2019 at 03:49:43PM +0200, Christoph Hellwig wrote:
> On Tue, May 14, 2019 at 12:26:32PM +0200, Borislav Petkov wrote:
> > This breaks scripts/spdxcheck.py, it needs below hunk. Also, should
> > "dual" be added to license_dirs too?
> 
> Yes.  In fact two people already submitted patches for that before
> you, just waiting for them to get picked up.

Yeah, it is definitely worth mentioning how minor stuff like that gets
noticed and fixed immediately in recent times. We've become better... :-)

Thx!

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.