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-graphics/cairo/cairo_1.16.0.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-graphics/cairo') 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" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" -LICENSE = "MPL-1 & LGPLv2.1 & GPLv3+" -LICENSE_${PN} = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-dev = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-doc = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-gobject = "MPL-1 & LGPLv2.1" -LICENSE_${PN}-script-interpreter = "MPL-1 & LGPLv2.1" +LICENSE = "MPL-1.1 & LGPLv2.1 & GPLv3+" +LICENSE_${PN} = "MPL-1.1 & LGPLv2.1" +LICENSE_${PN}-dev = "MPL-1.1 & LGPLv2.1" +LICENSE_${PN}-doc = "MPL-1.1 & LGPLv2.1" +LICENSE_${PN}-gobject = "MPL-1.1 & LGPLv2.1" +LICENSE_${PN}-script-interpreter = "MPL-1.1 & LGPLv2.1" LICENSE_${PN}-perf-utils = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -- cgit v1.2.3-54-g00ecf