[oe-commits] Elizabeth Flanagan : [YOCTO #1776] license: manifest and license path
git at git.openembedded.org
git at git.openembedded.org
Thu Dec 8 15:28:13 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 558b5043e1d5a36caff137093fd04abcf025af1c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=558b5043e1d5a36caff137093fd04abcf025af1c
Author: Elizabeth Flanagan <elizabeth.flanagan at intel.com>
Date: Sat Dec 3 15:16:15 2011 -0800
[YOCTO #1776] license: manifest and license path
This is a fairly large commit, so I want to step through some of
what this accomplishes:
1. Additional licenses
I've added/modified/corrected some of the common licenses
within OE-core in prep. for a major license audit. Most of these
are in SPDX format. A few, there is no OSI equivalent.
2. Additional SPDX mappings
I've added some additional SPDX mappings to account for removing
some duplicate licenses. (ie GPL-2 and GPL-2.0 were the same)
I've also remapped a few things to more accurately reflect what
they should be pointing at.
Note: Artistic/LGPL/GPL/MPL. Quite a few LICENSE fields list these
licenses. They make no sense and need auditing. In a future commit
I have some fixes to particularly egregious LICENSE fields, but
a full audit should be done. I've listed to obvious candidates at:
https://wiki.yoctoproject.org/wiki/License_Audit
3. License manifest
We now have a license manifest generation that occurs in rootfs for
everything BUT .deb. This requires the changes Paul Eggleton has
done to rootfs_* particularly the list_installed_packages function.
The manifest is accurate during a parallel bitbake now (Weee!) and
is prime for my planned SPDX format manifest during the next period.
4. License manifest on image.
We also want the ability to add licenses to the image. This
functionality is also in base-files and will be stripped out in my
next commit. The manifest is not added by default and is a two var
setting in license.conf:
If I want *just* the manifest on the image (small) then I set:
COPY_LIC_MANIFEST = "1"
This copies the manifest to:
/usr/share/common-licenses/license.manifest
If I want the actual PKG license text on the image (much larger)
I need to set both both COPY_LIC_MANIFEST and COPY_LIC_DIRS in
license.conf. This will create:
/usr/share/common-licenses/(package name)/(licenses in LIC_SRC_URI)
Word of warning. This can be larger than wanted depending on image
and is probably ripe for linking licenses, but I ran out of time this
week to get that done.
5. Custom License search path.
We now have the ability to add licenses to the build without touching
common-licenses. This is set via license.conf:
LICENSE_PATH += "/path/to/custom/licenses"
You want to make sure the license is unique. license.bbclass picks the
first license it finds.
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan at intel.com>
---
meta/classes/license.bbclass | 219 +++++---
meta/conf/licenses.conf | 54 ++-
meta/files/common-licenses/AFL-1 | 92 ---
meta/files/common-licenses/AFL-2 | 155 ------
meta/files/common-licenses/AGPL-3 | 213 -------
meta/files/common-licenses/APL-1 | 327 -----------
meta/files/common-licenses/APSL-1 | 334 -----------
meta/files/common-licenses/APSL-2 | 337 -----------
meta/files/common-licenses/Adobe | 14 +
meta/files/common-licenses/Apache-1 | 59 --
meta/files/common-licenses/Apache-2 | 203 -------
meta/files/common-licenses/Artistic | 131 -----
meta/files/common-licenses/Artistic-1 | 97 ----
meta/files/common-licenses/Artistic-2 | 202 -------
meta/files/common-licenses/BSL-1 | 25 -
meta/files/common-licenses/BitstreamVera | 160 ++++++
meta/files/common-licenses/CATOSL-1 | 335 -----------
meta/files/common-licenses/CC-BY-1 | 185 -------
meta/files/common-licenses/CC-BY-2 | 205 -------
meta/files/common-licenses/CC-BY-3 | 283 ----------
meta/files/common-licenses/CC-BY-NC-1 | 194 -------
meta/files/common-licenses/CC-BY-NC-2 | 220 --------
meta/files/common-licenses/CC-BY-NC-3 | 297 ----------
meta/files/common-licenses/CC-BY-NC-ND-1 | 146 -----
meta/files/common-licenses/CC-BY-NC-ND-2 | 209 -------
meta/files/common-licenses/CC-BY-NC-ND-3 | 272 ---------
meta/files/common-licenses/CC-BY-NC-SA-1 | 209 -------
meta/files/common-licenses/CC-BY-NC-SA-2 | 242 --------
meta/files/common-licenses/CC-BY-NC-SA-3 | 320 -----------
meta/files/common-licenses/CC-BY-ND-2 | 194 -------
meta/files/common-licenses/CC-BY-ND-3 | 259 ---------
meta/files/common-licenses/CC-BY-SA-1 | 201 -------
meta/files/common-licenses/CC-BY-SA-2 | 227 --------
meta/files/common-licenses/CC-BY-SA-3 | 319 -----------
meta/files/common-licenses/CDDL-1 | 313 -----------
meta/files/common-licenses/CECILL-1 | 462 ----------------
meta/files/common-licenses/CECILL-2 | 451 ---------------
meta/files/common-licenses/CPAL-1 | 435 ---------------
meta/files/common-licenses/CPL-1 | 250 ---------
meta/files/common-licenses/CUA-OPL-1 | 482 ----------------
meta/files/common-licenses/DSSSL | 49 ++
meta/files/common-licenses/ECL-1 | 61 --
meta/files/common-licenses/ECL-2 | 218 --------
meta/files/common-licenses/EDL-1.0 | 13 +
meta/files/common-licenses/EFL-1 | 30 -
meta/files/common-licenses/EFL-2 | 27 -
meta/files/common-licenses/EPL-1 | 204 -------
meta/files/common-licenses/EUPL-1 | 302 ----------
meta/files/common-licenses/Elfutils-Exception | 12 +
meta/files/common-licenses/ErlPL-1 | 293 ----------
meta/files/common-licenses/FSF-Unlimited | 4 +
meta/files/common-licenses/Frameworx-1 | 181 ------
meta/files/common-licenses/FreeType | 170 ++++++
meta/files/common-licenses/GPL-1 | 259 ---------
meta/files/common-licenses/GPL-1.0+ | 252 ---------
meta/files/common-licenses/GPL-2 | 23 -
.../common-licenses/GPL-2,0-with-GCC-exception | 17 -
.../common-licenses/GPL-2,0-with-font-exception | 18 -
meta/files/common-licenses/GPL-2.0+ | 132 -----
.../common-licenses/GPL-2.0-with-GCC-exception | 13 +-
.../common-licenses/GPL-2.0-with-font-exception | 14 +-
meta/files/common-licenses/GPL-3 | 70 ---
meta/files/common-licenses/GPL-3.0 | 224 ++++++++-
meta/files/common-licenses/GPL-3.0+ | 3 -
meta/files/common-licenses/IPL-1 | 222 --------
meta/files/common-licenses/LGPL-2 | 461 ----------------
meta/files/common-licenses/LGPL-2.0 | 189 ++++++-
meta/files/common-licenses/LGPL-2.0+ | 173 ------
meta/files/common-licenses/LGPL-2.1+ | 176 ------
meta/files/common-licenses/LGPL-3 | 147 -----
meta/files/common-licenses/LGPL-3.0 | 53 +-
meta/files/common-licenses/LGPL-3.0+ | 66 ---
meta/files/common-licenses/LPL-1 | 213 -------
meta/files/common-licenses/LPPL-1 | 422 --------------
meta/files/common-licenses/MIT-style | 1 -
meta/files/common-licenses/MPL-1 | 433 ---------------
meta/files/common-licenses/NASA-1 | 246 ---------
meta/files/common-licenses/NPOSL-3 | 206 -------
meta/files/common-licenses/OASIS | 13 +
meta/files/common-licenses/OCLC-2 | 207 -------
meta/files/common-licenses/OFL-1 | 96 ----
meta/files/common-licenses/OLDAP-2 | 54 --
meta/files/common-licenses/OSL-1 | 172 ------
meta/files/common-licenses/OSL-1.0 | 2 +-
meta/files/common-licenses/OSL-2 | 171 ------
meta/files/common-licenses/OSL-3 | 157 ------
meta/files/common-licenses/PHP-3 | 70 ---
meta/files/common-licenses/Proprietary | 1 +
meta/files/common-licenses/Python-2 | 192 -------
meta/files/common-licenses/QPL-1 | 96 ----
meta/files/common-licenses/RPL-1 | 582 --------------------
meta/files/common-licenses/RPSL-1 | 535 ------------------
meta/files/common-licenses/SPL | 519 -----------------
meta/files/common-licenses/Simple-2 | 53 --
meta/files/common-licenses/UCB | 26 +
meta/files/common-licenses/VSL-1 | 54 --
meta/files/common-licenses/Watcom-1 | 389 -------------
meta/files/common-licenses/XFree86-1 | 50 --
meta/files/common-licenses/YPL-1 | 140 -----
meta/files/common-licenses/ZPL-1 | 60 --
meta/files/common-licenses/ZPL-2 | 44 --
meta/files/common-licenses/Zimbra-1 | 140 -----
meta/files/common-licenses/eCos-2 | 38 --
103 files changed, 1119 insertions(+), 17671 deletions(-)
Diff: http://git.openembedded.org/?p=openembedded-core.git/?a=commitdiff;h=558b5043e1d5a36caff137093fd04abcf025af1c
More information about the Openembedded-commits
mailing list