On 28 April 2016 at 16:27, Peter Kjellerstedt <[email protected]> wrote: >> -----Original Message----- >> From: [email protected] >> [mailto:[email protected]] On Behalf Of >> Elizabeth Flanagan >> Sent: den 28 april 2016 14:49 >> To: [email protected] >> Subject: [OE-core] [PATCH] common-licenses: Refresh to current SPDX >> license list >> >> This commit pulls the SPDX license list and license text from >> http://git.spdx.org/license-list.git and reworks it slightly >> (remove .txt extention and remove GPL+ licenses). >> >> Eventually we should probably consider using the actual repository >> without edits. >> >> It adds quite a number of new licenses and formats the license >> text we have so that it matches what is currently in the SPDX >> tree. >> >> This patch also adds these licenses to SRC_DISTRIBUTE_LICENSES in >> conf/licenses.conf >> >> I've avoided adding these to the SPDX mapping variable as most of >> that was only needed for backwards compatibility. >> >> Signed-off-by: Elizabeth Flanagan <[email protected]> >> --- >> meta/conf/licenses.conf | 101 ++- >> meta/files/common-licenses/AAL | 66 +- > > [cut] > >> diff --git a/meta/files/common-licenses/AAL b/meta/files/common- >> licenses/AAL >> index 5484226..95c25cd 100644 >> --- a/meta/files/common-licenses/AAL >> +++ b/meta/files/common-licenses/AAL >> @@ -1,51 +1,23 @@ >> +Attribution Assurance License >> >> -Attribution Assurance License >> -Copyright (c) 2002 by AUTHOR >> -PROFESSIONAL IDENTIFICATION * URL >> -"PROMOTIONAL SLOGAN FOR AUTHOR`S PROFESSIONAL PRACTICE" >> +Copyright (c) <<var;name=copyright;original=2002 by AUTHOR PROFESSIONAL >> IDENTIFICATION * URL "PROMOTIONAL SLOGAN FOR AUTHOR'S PROFESSIONAL >> PRACTICE";match=.+>> > > The license texts as taken directly from the SPDX repository do > not seem suitable for inclusion in an image as they are full of > conditional <<...>> tags as per above. You probably need to post- > process the files and replace all tags with something suitable... >
Agreed. Let me look at that and I'll repost. -b > //Peter > -- Elizabeth Flanagan Yocto Project Build and Release -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
