Skip to content

Commit

Permalink
LICENSES: Clearly mark dual license only licenses
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Jonathan Corbet <[email protected]>
  • Loading branch information
Christoph Hellwig authored and Jonathan Corbet committed May 3, 2019
1 parent 6132c37 commit 8ea8814
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 3 deletions.
51 changes: 50 additions & 1 deletion Documentation/process/license-rules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions LICENSES/other/Apache-2.0 → LICENSES/dual/Apache-2.0
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions LICENSES/other/CDDL-1.0 → LICENSES/dual/CDDL-1.0
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions LICENSES/other/MPL-1.1 → LICENSES/dual/MPL-1.1
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit 8ea8814

Please sign in to comment.