summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2012-09-26 14:50:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 11:07:42 +0100
commitad1aa810ac0f24e69185d30964c3b2cc1ca822d7 (patch)
tree21b37e5d6fc18fb282aa80ebe6409315a3a72db1 /meta
parent0f9ca5da65611034e6d0e9158c4d2188cc4c3b2e (diff)
downloadpoky-ad1aa810ac0f24e69185d30964c3b2cc1ca822d7.tar.gz
license.conf/bbclass: Move globals to license.conf
This requires the changes to bitbake.conf that allow parsing of license.conf. As we should now be parsing license.conf, we can move some globals out of license.bblcass and into the conf file. (From OE-Core rev: 03e6a7cd27ed109a011fac09cf04412f87f31c3a) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass65
-rw-r--r--meta/conf/licenses.conf64
2 files changed, 64 insertions, 65 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ad543f6188..a66933f733 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -10,71 +10,6 @@ addtask populate_lic after do_patch before do_package
10do_populate_lic[dirs] = "${LICSSTATEDIR}/${PN}" 10do_populate_lic[dirs] = "${LICSSTATEDIR}/${PN}"
11do_populate_lic[cleandirs] = "${LICSSTATEDIR}" 11do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
12 12
13# Standards are great! Everyone has their own. In an effort to standardize licensing
14# names, common-licenses will use the SPDX standard license names. In order to not
15# break the non-standardized license names that we find in LICENSE, we'll set
16# up a bunch of VarFlags to accomodate non-SPDX license names.
17#
18# We should really discuss standardizing this field, but that's a longer term goal.
19# For now, we can do this and it should grab the most common LICENSE naming variations.
20#
21# We should NEVER have a GPL/LGPL without a version!!!!
22# Any mapping to MPL/LGPL/GPL should be fixed
23# see: https://wiki.yoctoproject.org/wiki/License_Audit
24
25# GPL variations
26SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
27SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
28SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
29SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
30SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
31SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
32SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
33SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
34SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
35
36#LGPL variations
37SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
38SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
39SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
40SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
41SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
42
43#MPL variations
44SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
45SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
46SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
47SPDXLICENSEMAP[MPLv2] = "MPL-2.0"
48
49#MIT variations
50SPDXLICENSEMAP[MIT-X] = "MIT"
51SPDXLICENSEMAP[MIT-style] = "MIT"
52
53#Openssl variations
54SPDXLICENSEMAP[openssl] = "OpenSSL"
55
56#Python variations
57SPDXLICENSEMAP[PSF] = "Python-2.0"
58SPDXLICENSEMAP[PSFv2] = "Python-2.0"
59SPDXLICENSEMAP[Python-2] = "Python-2.0"
60
61#Apache variations
62SPDXLICENSEMAP[Apachev2] = "Apache-2.0"
63SPDXLICENSEMAP[Apache-2] = "Apache-2.0"
64
65#Artistic variations
66SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0"
67SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0"
68
69#Academic variations
70SPDXLICENSEMAP[AFL-2] = "AFL-2.0"
71SPDXLICENSEMAP[AFL-1] = "AFL-1.2"
72SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
73SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
74
75#Other variations
76SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"
77
78license_create_manifest() { 13license_create_manifest() {
79 mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME} 14 mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
80 # Get list of installed packages 15 # Get list of installed packages
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 6ed4dfe405..3cb143c863 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -39,6 +39,70 @@ SRC_DISTRIBUTE_LICENSES += "SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C"
39SRC_DISTRIBUTE_LICENSES += "Watcom-1.0 WXwindows XFree86-1.1 Xnet YPL-1.1" 39SRC_DISTRIBUTE_LICENSES += "Watcom-1.0 WXwindows XFree86-1.1 Xnet YPL-1.1"
40SRC_DISTRIBUTE_LICENSES += "Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1" 40SRC_DISTRIBUTE_LICENSES += "Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1"
41 41
42# Standards are great! Everyone has their own. In an effort to standardize licensing
43# names, common-licenses will use the SPDX standard license names. In order to not
44# break the non-standardized license names that we find in LICENSE, we'll set
45# up a bunch of VarFlags to accomodate non-SPDX license names.
46#
47# We should really discuss standardizing this field, but that's a longer term goal.
48# For now, we can do this and it should grab the most common LICENSE naming variations.
49#
50# We should NEVER have a GPL/LGPL without a version!!!!
51# Any mapping to MPL/LGPL/GPL should be fixed
52# see: https://wiki.yoctoproject.org/wiki/License_Audit
53
54# GPL variations
55SPDXLICENSEMAP[GPL-1] = "GPL-1.0"
56SPDXLICENSEMAP[GPLv1] = "GPL-1.0"
57SPDXLICENSEMAP[GPLv1.0] = "GPL-1.0"
58SPDXLICENSEMAP[GPL-2] = "GPL-2.0"
59SPDXLICENSEMAP[GPLv2] = "GPL-2.0"
60SPDXLICENSEMAP[GPLv2.0] = "GPL-2.0"
61SPDXLICENSEMAP[GPL-3] = "GPL-3.0"
62SPDXLICENSEMAP[GPLv3] = "GPL-3.0"
63SPDXLICENSEMAP[GPLv3.0] = "GPL-3.0"
64
65#LGPL variations
66SPDXLICENSEMAP[LGPLv2] = "LGPL-2.0"
67SPDXLICENSEMAP[LGPLv2.0] = "LGPL-2.0"
68SPDXLICENSEMAP[LGPL2.1] = "LGPL-2.1"
69SPDXLICENSEMAP[LGPLv2.1] = "LGPL-2.1"
70SPDXLICENSEMAP[LGPLv3] = "LGPL-3.0"
71
72#MPL variations
73SPDXLICENSEMAP[MPL-1] = "MPL-1.0"
74SPDXLICENSEMAP[MPLv1] = "MPL-1.0"
75SPDXLICENSEMAP[MPLv1.1] = "MPL-1.1"
76SPDXLICENSEMAP[MPLv2] = "MPL-2.0"
77
78#MIT variations
79SPDXLICENSEMAP[MIT-X] = "MIT"
80SPDXLICENSEMAP[MIT-style] = "MIT"
81
82#Openssl variations
83SPDXLICENSEMAP[openssl] = "OpenSSL"
84
85#Python variations
86SPDXLICENSEMAP[PSF] = "Python-2.0"
87SPDXLICENSEMAP[PSFv2] = "Python-2.0"
88SPDXLICENSEMAP[Python-2] = "Python-2.0"
89
90#Apache variations
91SPDXLICENSEMAP[Apachev2] = "Apache-2.0"
92SPDXLICENSEMAP[Apache-2] = "Apache-2.0"
93
94#Artistic variations
95SPDXLICENSEMAP[Artisticv1] = "Artistic-1.0"
96SPDXLICENSEMAP[Artistic-1] = "Artistic-1.0"
97
98#Academic variations
99SPDXLICENSEMAP[AFL-2] = "AFL-2.0"
100SPDXLICENSEMAP[AFL-1] = "AFL-1.2"
101SPDXLICENSEMAP[AFLv2] = "AFL-2.0"
102SPDXLICENSEMAP[AFLv1] = "AFL-1.2"
103
104#Other variations
105SPDXLICENSEMAP[EPLv1.0] = "EPL-1.0"
42 106
43# Additional license directories. Add your custom licenses directories this path. 107# Additional license directories. Add your custom licenses directories this path.
44# LICENSE_PATH += "${COREBASE}/custom-licenses" 108# LICENSE_PATH += "${COREBASE}/custom-licenses"