summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-06-07 13:40:27 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-06-07 13:40:27 +0000
commitda9419add5ae4fccc2078bad5c3eab413ed4c15e (patch)
tree4484c30f2c3686505e70f6de5292d4fa7140e49f /meta
parent5a5dec4e0caa0d713011ddb2c2daaecb54c342be (diff)
downloadpoky-da9419add5ae4fccc2078bad5c3eab413ed4c15e.tar.gz
src_distribute: fix when licenses are separated with |, renamed vars to more readable ones
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1885 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/src_distribute.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/src_distribute.bbclass b/meta/classes/src_distribute.bbclass
index 68fa787a21..f20410d0bb 100644
--- a/meta/classes/src_distribute.bbclass
+++ b/meta/classes/src_distribute.bbclass
@@ -6,15 +6,15 @@ python do_distribute_sources () {
6 6
7 sources_dir = bb.data.getVar('SRC_DISTRIBUTEDIR', d, 1) 7 sources_dir = bb.data.getVar('SRC_DISTRIBUTEDIR', d, 1)
8 import re 8 import re
9 for l in licenses: 9 for license in licenses:
10 for i in l.split("|"): 10 for entry in license.split("|"):
11 for s in (bb.data.getVar('A', d, 1) or "").split(): 11 for s in (bb.data.getVar('A', d, 1) or "").split():
12 s = re.sub(';.*$', '', s) 12 s = re.sub(';.*$', '', s)
13 cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1) 13 cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
14 if not cmd: 14 if not cmd:
15 raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined") 15 raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not defined")
16 bb.data.setVar('SRC', s, d) 16 bb.data.setVar('SRC', s, d)
17 bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, l), d) 17 bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, entry), d)
18 bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d) 18 bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
19} 19}
20 20