Skip to contentSkip to conversation

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

PATCH Applied Hans de Goede 2 participants 4 messages Oct 10, 2018 – Oct 12, 2018 Licenses and spdx stuff

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

---
Changes in v2:
-Add text specifying that CDDL may only be used together with OR -Change GPL-2.0 in example with $GPL-COMPATIBLE-ID

---
 LICENSES/other/CDDL-1.0 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
LICENSES/other/CDDL-1.0 +5 -1
index 195a1687930a..25f614276ddd 100644
@@ -1,10 +1,14 @@
 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.
+  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
   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-COMPATIBLE-ID OR CDDL-1.0)
 
 License-Text:
 
Signature · 1 line
2.19.0
#1 lore raw

PATCH v2 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

Re: [PATCH v2 2/2] LICENSES: Add ISC license text

Quoted 11 lines · On Wed, 10 Oct 2018 22:15:09 +0200 Hans de Goede <[email protected]> wrote:

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.

Applied this one too, thanks.

jon