From 9f005f0539b53fe9f5516ed9aa26d8d5d95736ee Mon Sep 17 00:00:00 2001 From: Filip Jareš Date: Wed, 5 Jun 2019 09:34:08 +0200 Subject: 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 --- meta/recipes-core/dbus/dbus-glib_0.110.bb | 2 +- meta/recipes-core/dbus/dbus-test_1.12.14.bb | 2 +- meta/recipes-core/dbus/dbus_1.12.14.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/dbus') 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" DESCRIPTION = "GLib bindings for the D-Bus message bus that integrate \ the D-Bus library with the GLib thread abstraction and main loop." HOMEPAGE = "http://www.freedesktop.org/Software/dbus" -LICENSE = "AFL-2 | GPLv2+" +LICENSE = "AFL-2.1 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cf5b3a2f7083750d504333114e738656 \ file://dbus/dbus-glib.h;beginline=7;endline=21;md5=7755c9d7abccd5dbd25a6a974538bb3c" SECTION = "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 @@ SUMMARY = "D-Bus test package (for D-bus functionality testing only)" HOMEPAGE = "http://dbus.freedesktop.org" SECTION = "base" -LICENSE = "AFL-2 | GPLv2+" +LICENSE = "AFL-2.1 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 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" DESCRIPTION = "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." HOMEPAGE = "http://dbus.freedesktop.org" SECTION = "base" -LICENSE = "AFL-2 | GPLv2+" +LICENSE = "AFL-2.1 | GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" DEPENDS = "expat virtual/libintl autoconf-archive" -- cgit v1.2.3-54-g00ecf