summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Jareš <filipjares@gmail.com>2019-06-05 09:34:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-06 00:40:08 +0100
commit9f005f0539b53fe9f5516ed9aa26d8d5d95736ee (patch)
tree966bcbd49c39c424d1b1333114f84d8bf731e3c5
parentebc8a8834a28be78afe3f2c515c86df412af2980 (diff)
downloadpoky-9f005f0539b53fe9f5516ed9aa26d8d5d95736ee.tar.gz
recipes: Fix license "names"/versions.
These were broken in commit 4786ecdf7cd427089464dcb62579110d494e7cd7 which performed a cleanup to avoid non-standard field names. There is an SPDX License list at https://spdx.org/licenses/ which aims to be a standard. Yocto also uses a substitution map SPDXLICENSEMAP, default one stored at meta/conf/licenses.conf. According to meta/conf/licenses.conf, "AFL-2" corresponds to "AFL-2.0" which is not correct for dbus. According to the same licenses.conf file "MPL-1" corresponds to "MPL-1.0", which is correct for libical but since SPDX aims to be a standard I am updating the identifier in libical's .bb file as well. To verify the actual license used you can use: dbus: cd /tmp/ wget http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz tar -xaf dbus-glib-0.110.tar.gz cd dbus-glib-0.110 grep -A1 "^The Academic Free License$" COPYING cd /tmp/ wget http://dbus.freedesktop.org/releases/dbus/dbus-1.12.14.tar.gz tar -xaf dbus-1.12.14.tar.gz cd dbus-1.12.14 grep -A1 "^The Academic Free License$" COPYING cairo: wget --quiet -O - https://cgit.freedesktop.org/cairo/plain/COPYING-MPL-1.1?h=1.16.0 | grep -A1 "MOZILLA PUBLIC LICENSE" libical: wget --quiet -O - https://raw.githubusercontent.com/libical/libical/v2.0.0/COPYING | grep "Mozilla Public License" taglib: wget --quiet -O - https://raw.githubusercontent.com/taglib/taglib/v1.11.1/COPYING.MPL | grep -A1 "MOZILLA PUBLIC LICENSE" (From OE-Core rev: 85cdf2ddfbfa956f9fcb705f886645f1884149c1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus-glib_0.110.bb2
-rw-r--r--meta/recipes-core/dbus/dbus-test_1.12.14.bb2
-rw-r--r--meta/recipes-core/dbus/dbus_1.12.14.bb2
-rw-r--r--meta/recipes-graphics/cairo/cairo_1.16.0.bb12
-rw-r--r--meta/recipes-support/libical/libical_2.0.0.bb2
-rw-r--r--meta/recipes-support/taglib/taglib_1.11.1.bb2
6 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib_0.110.bb b/meta/recipes-core/dbus/dbus-glib_0.110.bb
index b7383bd2a6..9afbc2b6a1 100644
--- a/meta/recipes-core/dbus/dbus-glib_0.110.bb
+++ b/meta/recipes-core/dbus/dbus-glib_0.110.bb
@@ -2,7 +2,7 @@ SUMMARY = "High level language (GLib) binding for D-Bus"
2DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \ 2DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \
3the D-Bus library with the GLib thread abstraction and main loop." 3the D-Bus library with the GLib thread abstraction and main loop."
4HOMEPAGE = "http://www.freedesktop.org/Software/dbus" 4HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
5LICENSE = "AFL-2 | GPLv2+" 5LICENSE = "AFL-2.1 | GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \
7 file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c" 7 file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c"
8SECTION = "base" 8SECTION = "base"
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.14.bb b/meta/recipes-core/dbus/dbus-test_1.12.14.bb
index d7eb628285..10447c6f08 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.14.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.14.bb
@@ -1,7 +1,7 @@
1SUMMARY = "D-Bus test package (for D-bus functionality testing only)" 1SUMMARY = "D-Bus test package (for D-bus functionality testing only)"
2HOMEPAGE = "http://dbus.freedesktop.org" 2HOMEPAGE = "http://dbus.freedesktop.org"
3SECTION = "base" 3SECTION = "base"
4LICENSE = "AFL-2 | GPLv2+" 4LICENSE = "AFL-2.1 | GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
6 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 6 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
7 7
diff --git a/meta/recipes-core/dbus/dbus_1.12.14.bb b/meta/recipes-core/dbus/dbus_1.12.14.bb
index 60d589dccc..4e7f614897 100644
--- a/meta/recipes-core/dbus/dbus_1.12.14.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.14.bb
@@ -2,7 +2,7 @@ SUMMARY = "D-Bus message bus"
2DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed." 2DESCRIPTION = "D-Bus is a message bus system, a simple way for applications to talk to one another. In addition to interprocess communication, D-Bus helps coordinate process lifecycle; it makes it simple and reliable to code a \"single instance\" application or daemon, and to launch applications and daemons on demand when their services are needed."
3HOMEPAGE = "http://dbus.freedesktop.org" 3HOMEPAGE = "http://dbus.freedesktop.org"
4SECTION = "base" 4SECTION = "base"
5LICENSE = "AFL-2 | GPLv2+" 5LICENSE = "AFL-2.1 | GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
8DEPENDS = "expat virtual/libintl autoconf-archive" 8DEPENDS = "expat virtual/libintl autoconf-archive"
diff --git a/meta/recipes-graphics/cairo/cairo_1.16.0.bb b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
index c2628ae0ca..f32e9ba1bc 100644
--- a/meta/recipes-graphics/cairo/cairo_1.16.0.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.16.0.bb
@@ -10,12 +10,12 @@ HOMEPAGE = "http://cairographics.org"
10BUGTRACKER = "http://bugs.freedesktop.org" 10BUGTRACKER = "http://bugs.freedesktop.org"
11SECTION = "libs" 11SECTION = "libs"
12 12
13LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+" 13LICENSE = "MPL-1.1 & LGPLv2.1 & GPLv3+"
14LICENSE_${PN} = "MPL-1 & LGPLv2.1" 14LICENSE_${PN} = "MPL-1.1 & LGPLv2.1"
15LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1" 15LICENSE_${PN}-dev = "MPL-1.1 & LGPLv2.1"
16LICENSE_${PN}-doc = "MPL-1 & LGPLv2.1" 16LICENSE_${PN}-doc = "MPL-1.1 & LGPLv2.1"
17LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1" 17LICENSE_${PN}-gobject = "MPL-1.1 & LGPLv2.1"
18LICENSE_${PN}-script-interpreter = "MPL-1 & LGPLv2.1" 18LICENSE_${PN}-script-interpreter = "MPL-1.1 & LGPLv2.1"
19LICENSE_${PN}-perf-utils = "GPLv3+" 19LICENSE_${PN}-perf-utils = "GPLv3+"
20 20
21LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" 21LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77"
diff --git a/meta/recipes-support/libical/libical_2.0.0.bb b/meta/recipes-support/libical/libical_2.0.0.bb
index fc33f8ea2d..7dffdcfb01 100644
--- a/meta/recipes-support/libical/libical_2.0.0.bb
+++ b/meta/recipes-support/libical/libical_2.0.0.bb
@@ -1,7 +1,7 @@
1SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library" 1SUMMARY = "iCal and scheduling (RFC 2445, 2446, 2447) library"
2HOMEPAGE = "https://github.com/libical/libical" 2HOMEPAGE = "https://github.com/libical/libical"
3BUGTRACKER = "https://github.com/libical/libical/issues" 3BUGTRACKER = "https://github.com/libical/libical/issues"
4LICENSE = "LGPLv2.1 | MPL-1" 4LICENSE = "LGPLv2.1 | MPL-1.0"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=d4fc58309d8ed46587ac63bb449d82f8 \
6 file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6" 6 file://LICENSE;md5=d1a0891cd3e582b3e2ec8fe63badbbb6"
7SECTION = "libs" 7SECTION = "libs"
diff --git a/meta/recipes-support/taglib/taglib_1.11.1.bb b/meta/recipes-support/taglib/taglib_1.11.1.bb
index 01dcf66d1e..f4e288295d 100644
--- a/meta/recipes-support/taglib/taglib_1.11.1.bb
+++ b/meta/recipes-support/taglib/taglib_1.11.1.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Library for reading and editing the meta-data of popular audio formats" 1SUMMARY = "Library for reading and editing the meta-data of popular audio formats"
2SECTION = "libs/multimedia" 2SECTION = "libs/multimedia"
3HOMEPAGE = "http://taglib.github.io/" 3HOMEPAGE = "http://taglib.github.io/"
4LICENSE = "LGPLv2.1 | MPL-1" 4LICENSE = "LGPLv2.1 | MPL-1.1"
5LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ 5LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
6 file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ 6 file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \
7 file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee" 7 file://taglib/audioproperties.h;beginline=1;endline=24;md5=9df2c7399519b7310568a7c55042ecee"