licenses: Map SGIv1 to SGI-OpenGL

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 991fb6cc231b5223489ec4d3f8953f48be208409..dcb499c3f37004666836046d7f52e39df280a075 100644 (file)
--- 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 4e194dee3ff138ac058d176f0bc072c16961782f..13cf12a33f70859cd4a79affdb99ab7d202a5d9e 100755 (executable)
--- 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):