From 62e3f0ff7b27d8beb21b4b226051c3db654ea4e4 Mon Sep 17 00:00:00 2001 From: Beth Flanagan Date: Wed, 25 May 2011 14:05:02 -0700 Subject: License Field Cleanup: Non-standard field names I've cleaned up some odd license fields, fixed some license names and corrected some incorrect licenses. LICENSE really needs a pass through by the maintainers as some of the licensing is incorrect. Also, every license with Artistic should be gone through and noted as which version of Artistic. (From OE-Core rev: 4786ecdf7cd427089464dcb62579110d494e7cd7) Signed-off-by: Beth Flanagan Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr-util_1.3.10.bb | 2 +- meta/recipes-support/apr/apr_1.4.2.bb | 2 +- meta/recipes-support/boost/boost-36.inc | 2 +- meta/recipes-support/boost/boost-jam-native.inc | 2 +- meta/recipes-support/boost/boost_1.44.0.bb | 2 +- meta/recipes-support/db/db_5.1.19.bb | 2 +- meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb | 2 +- meta/recipes-support/libgdbus/libgdbus_git.bb | 2 +- meta/recipes-support/taglib/taglib_1.6.3.bb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/apr/apr-util_1.3.10.bb b/meta/recipes-support/apr/apr-util_1.3.10.bb index 930f757ffd..7071b904f2 100644 --- a/meta/recipes-support/apr/apr-util_1.3.10.bb +++ b/meta/recipes-support/apr/apr-util_1.3.10.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" DEPENDS = "apr expat gdbm" -LICENSE = "Apache License, Version 2.0" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" diff --git a/meta/recipes-support/apr/apr_1.4.2.bb b/meta/recipes-support/apr/apr_1.4.2.bb index ce26ef17cb..89bdadf955 100644 --- a/meta/recipes-support/apr/apr_1.4.2.bb +++ b/meta/recipes-support/apr/apr_1.4.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -LICENSE = "Apache License, Version 2.0" +LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc index 5d2d1280be..3adc3ed770 100644 --- a/meta/recipes-support/boost/boost-36.inc +++ b/meta/recipes-support/boost/boost-36.inc @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.boost.org/" SECTION = "libs" DEPENDS = "boost-jam-native zlib" PRIORITY = "optional" -LICENSE = "Boost Software License" +LICENSE = "Boost" PR = "r3" ARM_INSTRUCTION_SET = "arm" diff --git a/meta/recipes-support/boost/boost-jam-native.inc b/meta/recipes-support/boost/boost-jam-native.inc index f0fac09361..fbaef1a8ac 100644 --- a/meta/recipes-support/boost/boost-jam-native.inc +++ b/meta/recipes-support/boost/boost-jam-native.inc @@ -7,7 +7,7 @@ DESCRIPTION = "Make system for boost (native)" HOMEPAGE = "http://www.boost.org/" SECTION = "devel" PRIORITY = "optional" -LICENSE = "Boost Software License" +LICENSE = "Boost" PR = "r0" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" diff --git a/meta/recipes-support/boost/boost_1.44.0.bb b/meta/recipes-support/boost/boost_1.44.0.bb index aa8b324af7..722149d710 100644 --- a/meta/recipes-support/boost/boost_1.44.0.bb +++ b/meta/recipes-support/boost/boost_1.44.0.bb @@ -1,6 +1,6 @@ include boost-36.inc -LICENSE = "boost" +LICENSE = "Boost" LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" PR = "r0" diff --git a/meta/recipes-support/db/db_5.1.19.bb b/meta/recipes-support/db/db_5.1.19.bb index 7b7c4dd75f..98b23b12c8 100644 --- a/meta/recipes-support/db/db_5.1.19.bb +++ b/meta/recipes-support/db/db_5.1.19.bb @@ -11,7 +11,7 @@ SECTION = "libs" DESCRIPTION = "Berkeley DB v5." HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" -LICENSE = "BSD Sleepycat" +LICENSE = "Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" PR = "r2" diff --git a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb index e56ba26e24..a4423ab4dc 100644 --- a/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb +++ b/meta/recipes-support/js/js_1.7.0+1.8.0rc1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mozilla.org/js/spidermonkey/" SECTION = "libs" # the package is licensed under either of the following -LICENSE = "MPL1.1 | GPLv2+ | LGPLv2.1+" +LICENSE = "MPL-1 | GPLv2+ | LGPLv2.1+" LIC_FILES_CHKSUM = "file://jsapi.c;beginline=4;endline=39;md5=347c6bbf4fb4547de1fa5ad830030063" PR = "r2" diff --git a/meta/recipes-support/libgdbus/libgdbus_git.bb b/meta/recipes-support/libgdbus/libgdbus_git.bb index 76fa134b8f..bd914364b5 100644 --- a/meta/recipes-support/libgdbus/libgdbus_git.bb +++ b/meta/recipes-support/libgdbus/libgdbus_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Library for simple D-Bus integration with GLib" HOMEPAGE = "http://www.bluez.org" SECTION = "libs" PRIORITY = "optional" -LICENSE = "GPLv2&LGPLv2.1" +LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09" diff --git a/meta/recipes-support/taglib/taglib_1.6.3.bb b/meta/recipes-support/taglib/taglib_1.6.3.bb index f45108b333..63b965cb68 100644 --- a/meta/recipes-support/taglib/taglib_1.6.3.bb +++ b/meta/recipes-support/taglib/taglib_1.6.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "TagLib is a library for reading and editing the meta-data of several popular audio formats" SECTION = "libs/multimedia" HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html" -LICENSE = "LGPLv2.1 | MPLv1.1" +LICENSE = "LGPLv2.1 | MPL-1" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=db979804f025cf55aabec7129cb671ed \ file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \ file://taglib/audioproperties.h;beginline=1;endline=24;md5=39dcdd772f378a0f8c9a41bc929eccce" -- cgit v1.2.3-54-g00ecf