aboutsummaryrefslogtreecommitdiffstats
path: root/classes/src_distribute.bbclass
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-03-21 18:31:25 -0700
committerChris Larson <chris_larson@mentor.com>2010-03-21 18:31:40 -0700
commitd91b6bc42319db7799cf9188f7150f807ed41163 (patch)
tree3e478c7942c41699b454930dbba5c7000a8a38e9 /classes/src_distribute.bbclass
parent02630483284a2f31b01e636210715ee1fb6e63b9 (diff)
downloadopenembedded-d91b6bc42319db7799cf9188f7150f807ed41163.tar.gz
openembedded-d91b6bc42319db7799cf9188f7150f807ed41163.tar.bz2
openembedded-d91b6bc42319db7799cf9188f7150f807ed41163.zip
src_distribute: simplify do_distribute_sources
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'classes/src_distribute.bbclass')
-rw-r--r--classes/src_distribute.bbclass52
1 files changed, 24 insertions, 28 deletions
diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass
index 22044752ef..795a5cfe4e 100644
--- a/classes/src_distribute.bbclass
+++ b/classes/src_distribute.bbclass
@@ -3,38 +3,34 @@ SRC_DISTRIBUTECOMMAND[func] = "1"
addtask distribute_sources before do_build after do_fetch
python do_distribute_sources () {
- import re
-
bb.build.exec_func("do_fetch", d)
- l = bb.data.createCopy(d)
- bb.data.update_data(l)
+ cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
+ if not cmd:
+ raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not set")
+
+ try:
+ dlonly = int(d.getVar("SRC_DISTRIBUTE_DLONLY", 1))
+ except ValueError:
+ raise bb.build.FuncFailed("Invalid value for SRC_DISTRIBUTE_DLONLY: expected integer.")
+ dldir = os.path.realpath(d.getVar("DL_DIR", 1) or "")
licenses = (bb.data.getVar('LICENSE', d, 1) or "unknown").split()
- for license in licenses:
- for entry in license.split("|"):
- for url in ((bb.data.getVar('SRC_URI', d, 1) or '').split()):
- bb.fetch.init([url], d)
- s = bb.fetch.localpath(url, d)
- s = re.sub(';.*$', '', s)
-
- try:
- dlonly = int(d.getVar("SRC_DISTRIBUTE_DLONLY", 1))
- except ValueError:
- raise bb.build.FuncFailed("Invalid value for SRC_DISTRIBUTE_DLONLY: expected integer.")
- if dlonly:
- dldir = os.path.realpath(d.getVar("DL_DIR", 1) or "")
- if dldir and not \
- os.path.realpath(s).startswith(dldir + os.path.sep):
- continue
-
- cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1)
- if not cmd:
- raise bb.build.FuncFailed("Unable to distribute sources, SRC_DISTRIBUTECOMMAND not set")
- bb.debug(2, "srcdist: running %s" % cmd)
- bb.data.setVar('SRC', os.path.normpath(s), l)
- bb.data.setVar('LIC', entry, l)
- bb.build.exec_func('SRC_DISTRIBUTECOMMAND', l)
+ urldatadict = bb.fetch.init(d.getVar("SRC_URI", True).split(), d, True)
+ for url, urldata in urldatadict.iteritems():
+ if not urldata.setup:
+ urldata.setup_localpath(d)
+
+ local = urldata.localpath
+ if dlonly and dldir and not \
+ os.path.realpath(local).startswith(dldir + os.path.sep):
+ continue
+
+ 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)
}
addtask distribute_sources_all after do_distribute_sources