aboutsummaryrefslogtreecommitdiff
path: root/LICENSES
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2018-10-10 22:15:08 +0200
committerJonathan Corbet <corbet@lwn.net>2018-10-12 11:23:17 -0600
commit8639a0c790add196bdd457c98437fec299cde60e (patch)
tree440eb9868efeb3cd71900a4dc38b5ccdd23fbe75 /LICENSES
parent3a7452c5a72bd8098f6d4b37341e25a8725d790b (diff)
downloadlinux-stericsson-8639a0c790add196bdd457c98437fec299cde60e.tar.gz
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. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'LICENSES')
-rw-r--r--LICENSES/other/CDDL-1.06
1 files changed, 5 insertions, 1 deletions
diff --git a/LICENSES/other/CDDL-1.0 b/LICENSES/other/CDDL-1.0
index 195a1687930a..25f614276ddd 100644
--- a/LICENSES/other/CDDL-1.0
+++ b/LICENSES/other/CDDL-1.0
@@ -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: