From d445d9dbd0d7550a2ccc12e99484815b1cd07da0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 16 Nov 2004 01:17:41 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages-devel into handhelds.org:/home/kergoth/code/packages 2004/11/15 19:11:27-06:00 handhelds.org!kergoth Add the necessary virtual/libintl and virtual/libiconv PROVIDES to the uclibc and glibc builds. 2004/11/15 19:10:29-06:00 handhelds.org!kergoth Stage the target gettext build, and make it PROVIDES virtual/libintl. 2004/11/15 19:09:34-06:00 handhelds.org!kergoth Unbork the libiconv builds a bit, and make the target libiconv PROVIDES virtual/libiconv. 2004/11/12 12:03:48-06:00 handhelds.org!kergoth Merge openembedded@openembedded.bkbits.net:packages-devel into handhelds.org:/home/kergoth/code/packages 2004/11/11 14:12:30-06:00 handhelds.org!kergoth Merge openembedded@openembedded.bkbits.net:packages-devel into handhelds.org:/home/kergoth/code/packages 2004/11/11 14:06:04-06:00 handhelds.org!kergoth Enhance source distribution oeclass to support | seperated licenses (if any is distributable, that component is), and space seperated (all must be distributable). BKrev: 419955354rVOOt21Zfjv5KsGqY457w --- classes/src_distribute.oeclass | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/src_distribute.oeclass b/classes/src_distribute.oeclass index 72c4a722ed..8fe329c105 100644 --- a/classes/src_distribute.oeclass +++ b/classes/src_distribute.oeclass @@ -5,10 +5,28 @@ python do_distribute_sources () { import copy l = copy.deepcopy(d) oe.data.update_data(l) - license = oe.data.getVar('LICENSE', d, 1) + licenses = (oe.data.getVar('LICENSE', d, 1) or "").split() + if not licenses: + oe.note("LICENSE not defined") src_distribute_licenses = (oe.data.getVar('SRC_DISTRIBUTE_LICENSES', d, 1) or "").split() - if not oe.data.getVar('LICENSE', d, 1) in src_distribute_licenses: - oe.note("LICENSE not listed in SRC_DISTRIBUTE_LICENSES, skipping source distribution") + # Explanation: + # Space seperated items in LICENSE must *all* be distributable + # Each space seperated item may be used under any number of | seperated licenses. + # If any of those | seperated licenses are distributable, then that component is. + # i.e. LICENSE = "GPL LGPL" + # In this case, both components are distributable. + # LICENSE = "GPL|QPL|Proprietary" + # In this case, GPL is distributable, so the component is. + valid = 1 + for l in licenses: + lvalid = 0 + for i in l.split("|"): + if i in src_distribute_licenses: + lvalid = 1 + if lvalid != 1: + valid = 0 + if valid == 0: + oe.note("Licenses in LICENSE are not all listed in SRC_DISTRIBUTE_LICENSES, skipping source distribution") return import re for s in (oe.data.getVar('A', d, 1) or "").split(): -- cgit v1.2.3