[PATCH] docbook-xsl-stylesheets: Use SPDX identifier

[PATCH] docbook-xsl-stylesheets: Use SPDX identifier

[Bastian Germann]

The XSL license was standardized by SPDX as DocBook-XML.
Copy the license file to the new name and use it in
docbook-xsl-stylesheets.

License-Update: use new DocBook-XML SPDX ID, copy text from existing XSL

Signed-off-by: Bastian Germann <bage@debian.org>
---
 meta/files/common-licenses/DocBook-XML        | 48 +++++++++++++++++++
 .../docbook-xsl-stylesheets_1.79.1.bb         |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 meta/files/common-licenses/DocBook-XML

diff --git a/meta/files/common-licenses/DocBook-XML b/meta/files/common-licenses/DocBook-XML
new file mode 100644
index 0000000000..0a82d60c1c
--- /dev/null
+++ b/meta/files/common-licenses/DocBook-XML
@@ -0,0 +1,48 @@
+Copyright
+---------
+Copyright (C) 1999-2007 Norman Walsh
+Copyright (C) 2003 Jiří Kosek
+Copyright (C) 2004-2007 Steve Ball
+Copyright (C) 2005-2008 The DocBook Project
+Copyright (C) 2011-2012 O'Reilly Media
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the ``Software''), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+Except as contained in this notice, the names of individuals
+credited with contribution to this software shall not be used in
+advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization
+from the individuals in question.
+
+Any stylesheet derived from this Software that is publically
+distributed will be identified with a different name and the
+version strings in any derived Software will be changed so that
+no possibility of confusion between the derived package and this
+Software will exist.
+
+Warranty
+--------
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
+CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Contacting the Author
+---------------------
+The DocBook XSL stylesheets are maintained by Norman Walsh,
+<ndw@nwalsh.com>, and members of the DocBook Project,
+<docbook-developers@sf.net>
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
index beda0abe95..e628f62984 100644
--- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
+++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
@@ -1,6 +1,6 @@
 SUMMARY = "XSL stylesheets for processing DocBook XML to various output formats"
 HOMEPAGE = "http://docbook.sourceforge.net"
-LICENSE = "XSL"
+LICENSE = "DocBook-XML"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \

[PATCH] hwdata: Use SPDX identifier

[Bastian Germann]

The XFree86-1.0 (non-SPDX) license and the X11 (SPDX) license are the
same. Reference the X11 license in hwdata.

License-Update: use SPDX identifier

Signed-off-by: Bastian Germann <bage@debian.org>
---
 meta/recipes-support/hwdata/hwdata_0.391.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/hwdata/hwdata_0.391.bb b/meta/recipes-support/hwdata/hwdata_0.391.bb
index e4b8c59c59..b2fa87c275 100644
--- a/meta/recipes-support/hwdata/hwdata_0.391.bb
+++ b/meta/recipes-support/hwdata/hwdata_0.391.bb
@@ -4,7 +4,7 @@ configuration data, such as the pci.ids and usb.ids databases."
 HOMEPAGE = "https://github.com/vcrhonek/hwdata"
 SECTION = "System/Base"
 
-LICENSE = "GPL-2.0-or-later | XFree86-1.0"
+LICENSE = "GPL-2.0-or-later | X11"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
 
 SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"

[PATCH] licenses: Map SGIv1 to SGI-OpenGL

[Bastian Germann]

SGI-1 is not a SPDX license identifier. However, the SGI-1 license has
the same license text as SGI-OpenGL. Map the old SGIv1 name to SGI-OpenGL.

Signed-off-by: Bastian Germann <bage@debian.org>
---
 meta/conf/licenses.conf                  | 2 +-
 scripts/contrib/convert-spdx-licenses.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 991fb6cc23..dcb499c3f3 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -112,7 +112,7 @@ SPDXLICENSEMAP[tcl] = "TCL"
 SPDXLICENSEMAP[vim] = "Vim"
 
 # Silicon Graphics variations
-SPDXLICENSEMAP[SGIv1] = "SGI-1"
+SPDXLICENSEMAP[SGIv1] = "SGI-OpenGL"
 
 # Additional license directories. Add your custom licenses directories this path.
 # LICENSE_PATH += "${COREBASE}/custom-licenses"
diff --git a/scripts/contrib/convert-spdx-licenses.py b/scripts/contrib/convert-spdx-licenses.py
index 4e194dee3f..13cf12a33f 100755
--- a/scripts/contrib/convert-spdx-licenses.py
+++ b/scripts/contrib/convert-spdx-licenses.py
@@ -93,7 +93,7 @@ license_map = {
 "Nauman" : "Naumen",
 "tcl" : "TCL",
 "vim" : "Vim",
-"SGIv1" : "SGI-1",
+"SGIv1" : "SGI-OpenGL",
 }
 
 def processfile(fn):

[PATCH] tcf-agent: Use SPDX identifier

[Bastian Germann]

The EDL-1.0 license matches the SPDX template for BSD-3-Clause.
There is no reason why this should be referenced as EDL-1.0, which is
not a registered SPDX identifier for exactly this reason.

License-Update: use SPDX identifier

Signed-off-by: Bastian Germann <bage@debian.org>
---
 meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index 214dd4b2a8..e1ac0a29a7 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://wiki.eclipse.org/TCF"
 DESCRIPTION = "TCF is a vendor-neutral, lightweight, extensible network protocol mainly for communicating with embedded systems (targets)."
 BUGTRACKER = "https://bugs.eclipse.org/bugs/"
 
-LICENSE = "EPL-1.0 | EDL-1.0"
+LICENSE = "EPL-1.0 | BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
 
 SRCREV = "1f11747e83ebf4f53e8d17f430136f92ec378709"

[PATCH] unfs3: Use SPDX identifier

[Bastian Germann]

The unfs3 license matches the SPDX template for BSD-3-Clause.
There is no reason why this should be referenced as unfs3,
which is not a registered SPDX identifier.

License-Update: use SPDX identifier

Signed-off-by: Bastian Germann <bage@debian.org>
---
 meta/recipes-devtools/unfs3/unfs3_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/unfs3/unfs3_git.bb b/meta/recipes-devtools/unfs3/unfs3_git.bb
index c5b7898b3c..0a274d6ffd 100644
--- a/meta/recipes-devtools/unfs3/unfs3_git.bb
+++ b/meta/recipes-devtools/unfs3/unfs3_git.bb
@@ -4,7 +4,7 @@ specification. It provides a daemon for the MOUNT and NFS protocols, which \
 are used by NFS clients for accessing files on the server."
 HOMEPAGE = "https://github.com/unfs3/unfs3"
 SECTION = "console/network"
-LICENSE = "unfs3"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9475885294e17c0cc0067820d042792e"
 
 DEPENDS = "flex-native bison-native flex"