[oe-commits] Otavio Salvador : src_distribute.bbclass: distribute only SRC_DISTRIBUTE_LICENSES

[git version control]

Module: openembedded.git
Branch: master
Commit: 6651d6ea9c048e4045ecf7f834a9fe0f41f09566
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6651d6ea9c048e4045ecf7f834a9fe0f41f09566

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Fri Feb 25 20:14:35 2011 +0000

src_distribute.bbclass: distribute only SRC_DISTRIBUTE_LICENSES

A distro can require conf/licenses.conf or set SRC_DISTRIBUTE_LICENSES
selecting which licenses are wanted to be distributed. In case it is
empty or undefined we default to distribute all licenses to not break
backward compatibility.

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 classes/src_distribute.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass
index 242d70c..f3d3cba 100644
--- a/classes/src_distribute.bbclass
+++ b/classes/src_distribute.bbclass
@@ -16,6 +16,7 @@ python do_distribute_sources () {
 	dldir = os.path.realpath(d.getVar("DL_DIR", 1) or "")
 
 	licenses = (bb.data.getVar('LICENSE', d, 1) or "unknown").split()
+	distribute_licenses = (bb.data.getVar('SRC_DISTRIBUTE_LICENSES', d, 1) or "All").split()
 	urldatadict = bb.fetch.init(d.getVar("SRC_URI", True).split(), d, True)
 	src_uri = oe.data.typed_value("SRC_URI", d)
 	if not src_uri:
@@ -33,8 +34,9 @@ python do_distribute_sources () {
 		bb.data.setVar('SRC', os.path.abspath(local), d)
 		for license in licenses:
 			for entry in license.split("|"):
-				bb.data.setVar('LIC', entry, d)
-				bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
+				if entry in distribute_licenses or "All" in distribute_licenses:
+					bb.data.setVar('LIC', entry, d)
+					bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
 }
 
 addtask distribute_sources_all after do_distribute_sources