Skip to contentSkip to conversation

LICENSES: Add note to CDDL-1.0 license that it should not be used

PATCH Superseded Hans de Goede 3 participants 5 messages Oct 10, 2018 – Oct 15, 2018 Licenses and spdx stuff

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 LICENSES: Add note to CDDL-1.0 license that it should not be used

The only reason we have the CDDL-1.0 license text around is for some dual-licensed files from virtualbox. New code should not use this license.

Add a note about this and change the example tag to be dual-licensed.

---
 LICENSES/other/CDDL-1.0 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
LICENSES/other/CDDL-1.0 +3 -1
index 195a1687930a..164401ea9e62 100644
@@ -1,10 +1,12 @@
 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.
   To use the Common Development and Distribution License 1.0 put the
   following SPDX tag/value pair into a comment according to the placement
   guidelines in the licensing rules documentation:
-    SPDX-License-Identifier: CDDL-1.0
+    SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0)
 
 License-Text:
 
Signature · 1 line
2.19.0
#1 lore raw

PATCH 2/2 LICENSES: Add ISC license text

Add the full text of the ISC license to the kernel tree. It was copied directly from:

https://spdx.org/licenses/ISC.html

With the mention of "ISC" in the warranty disclaimer replaced with "THE AUTHOR" as done in the ISC license headers used in the ath10k and brcmfmac wifi drivers.

---
 LICENSES/other/ISC | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 LICENSES/other/ISC
LICENSES/other/ISC new file +24 -0
new file mode 100644
index 000000000000..8953c3142079
@@ -0,0 +1,24 @@
+Valid-License-Identifier: ISC
+SPDX-URL: https://spdx.org/licenses/ISC.html
+Usage-Guide:
+  To use the ISC License put the following SPDX tag/value pair into a
+  comment according to the placement guidelines in the licensing rules
+  documentation:
+    SPDX-License-Identifier: ISC
+License-Text:
+
+ISC License
+
+Copyright (c) <year> <copyright holders>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Signature · 1 line
2.19.0
#2 lore raw
In reply to Hans de Goede
Quoted 15 lines · Hans de Goede

The only reason we have the CDDL-1.0 license text around is for some dual-licensed files from virtualbox. New code should not use this license.

Add a note about this and change the example tag to be dual-licensed.

---
 LICENSES/other/CDDL-1.0 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
LICENSES/other/CDDL-1.0 +0 -0
index 195a1687930a..164401ea9e62 100644

LICENSES/other/CDDL-1.0 line 9

Quoted 10 lines
LICENSES/other/CDDL-1.0 +3 -1
@@ -1,10 +1,12 @@
 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.
   To use the Common Development and Distribution License 1.0 put the
   following SPDX tag/value pair into a comment according to the placement
   guidelines in the licensing rules documentation:
-    SPDX-License-Identifier: CDDL-1.0
+    SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0)

I'd rather replace the 'GPL-2.0' with something like '$GPL-COMPATIBLE-ID' and say explicitely in the prosa text that CCDL can only be used with OR and not with AND.

Thanks,

tglx

#3 lore raw
Quoted 3 lines · Thomas Gleixner

I'd rather replace the 'GPL-2.0' with something like '$GPL-COMPATIBLE-ID' and say explicitely in the prosa text that CCDL can only be used with OR and not with AND.

Maybe we should take the whole thing to a higher level, and split the other folder into

legacy/
- for licenses that exist but should never be used for new code

and

dual/
- for licenses that should only be used for dual licensing with something from preferred/

#4 lore raw
Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Thomas Gleixner

I'd rather replace the 'GPL-2.0' with something like '$GPL-COMPATIBLE-ID' and say explicitely in the prosa text that CCDL can only be used with OR and not with AND.

Maybe we should take the whole thing to a higher level, and split the other folder into

Quoted 8 lines

legacy/
- for licenses that exist but should never be used for new code

and

dual/
- for licenses that should only be used for dual licensing with something from preferred/

That makes sense.

Thanks,

tglx