X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=LICENSES%2Flicense-rules.txt;h=ecc8e4db162ff4cd007bfc55027d70bdc729a7ac;hb=305f293201a1d75f24eaa188294b78b284c8185b;hp=8d0c0a0ee93e24319a88c54c3de11d1f980aada7;hpb=96aaa77f72a721f058f3863f270c2ba3d8d68871;p=openocd.git

diff --git a/LICENSES/license-rules.txt b/LICENSES/license-rules.txt
index 8d0c0a0ee9..ecc8e4db16 100644
--- a/LICENSES/license-rules.txt
+++ b/LICENSES/license-rules.txt
@@ -173,7 +173,6 @@ OpenOCD, can be broken down into:
 
    File format examples::
 
-      Valid-License-Identifier: GPL-2.0
       Valid-License-Identifier: GPL-2.0-only
       Valid-License-Identifier: GPL-2.0-or-later
       SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
@@ -182,15 +181,70 @@ OpenOCD, can be broken down into:
         tag/value pairs into a comment according to the placement
         guidelines in the licensing rules documentation.
         For 'GNU General Public License (GPL) version 2 only' use:
-          SPDX-License-Identifier: GPL-2.0
-        or
           SPDX-License-Identifier: GPL-2.0-only
         For 'GNU General Public License (GPL) version 2 or any later version' use:
           SPDX-License-Identifier: GPL-2.0-or-later
       License-Text:
         Full license text
 
-2. Stand-alone licenses:
+2. Exceptions:
+
+   Some licenses can be amended with exceptions which grant certain rights
+   which the original license does not.  These exceptions are available
+   from the directory::
+
+      LICENSES/exceptions/
+
+   in the OpenOCD source tree.  The files in this directory contain the full
+   exception text and the required `Exception Metatags`_.
+
+   Examples::
+
+      LICENSES/exceptions/eCos-exception-2.0
+
+   Exception Metatags:
+
+   The following meta tags must be available in an exception file:
+
+   - SPDX-Exception-Identifier:
+
+     One exception identifier which can be used with SPDX license
+     identifiers.
+
+   - SPDX-URL:
+
+     The URL of the SPDX page which contains additional information related
+     to the exception.
+
+   - SPDX-Licenses:
+
+     A comma separated list of SPDX license identifiers for which the
+     exception can be used.
+
+   - Usage-Guidance:
+
+     Freeform text for usage advice. The text must be followed by correct
+     examples for the SPDX license identifiers as they should be put into
+     source files according to the `License identifier syntax`_ guidelines.
+
+   - Exception-Text:
+
+     All text after this tag is treated as the original exception text
+
+   File format examples::
+
+      SPDX-Exception-Identifier: eCos-exception-2.0
+      SPDX-URL: https://spdx.org/licenses/eCos-exception-2.0.html
+      SPDX-Licenses: GPL-2.0-only, GPL-2.0-or-later
+      Usage-Guide:
+        This exception is used together with one of the above SPDX-Licenses.
+        To use this exception add it with the keyword WITH to one of the
+        identifiers in the SPDX-Licenses tag:
+          SPDX-License-Identifier: <SPDX-License> WITH eCos-exception-2.0
+      License-Text:
+        Full license text
+
+3. Stand-alone licenses:
 
    These licenses should only be used for stand-alone applications that are
    distributed with OpenOCD but are not included in the OpenOCD binary.