summaryrefslogtreecommitdiff
path: root/classes/src_distribute.bbclass
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-05-28 15:27:31 -0700
committerChris Larson <clarson@mvista.com>2009-08-19 14:54:29 -0700
commitee09ed852dd3e6a831a9ae5c31f260a4a9057645 (patch)
tree42539baf08100852144578ea298c8ba42a1c2bb8 /classes/src_distribute.bbclass
parentf9b6fb8272850ebb1a001f6f055df8a3c74733fd (diff)
src_distribute*.bbclass: cleanup, revamp parts, distribute all sources.
- Kill the big shell function with the case statement used in _local in favor of a set of bitbake variables, with the appropriate one selected as SRC_DISTRIBUTECOMMAND. - Add and use SRC_DISTRIBUTE_DLONLY to toggle distribution of all sources versus just those downloaded to DL_DIR. This variable expects to be set to an integer, anything but 0 will enable dlonly operation. This is disabled by default. - Add a more sanely named distribute_sources_all, and make distsrcall depend on it, for compatibility. - By default, distributes the sources into ${SRC_DISTRIBUTEDIR}/${LIC}/${PN}/. - Move some _local specific bits, like use of SRC_DISTRIBUTEDIR, out of the main class. - Set a "LIC" var along with the "SRC" when running SRC_DISTRIBUTECOMMAND, to facilitate the above. Signed-off-by: Chris Larson <clarson@mvista.com>
Diffstat (limited to 'classes/src_distribute.bbclass')
-rw-r--r--classes/src_distribute.bbclass41
1 files changed, 28 insertions, 13 deletions
diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass
index 30b2670011..3a033b9673 100644
--- a/classes/src_distribute.bbclass
+++ b/classes/src_distribute.bbclass
@@ -1,29 +1,44 @@
+SRC_DISTRIBUTE_DLONLY ?= "0"
SRC_DISTRIBUTECOMMAND[func] = "1"
+
+addtask distribute_sources before do_build after do_fetch
python do_distribute_sources () {
+ import os, re, bb
+
l = bb.data.createCopy(d)
bb.data.update_data(l)
- licenses = (bb.data.getVar('LICENSE', d, 1) or "unknown").split()
- sources_dir = bb.data.getVar('SRC_DISTRIBUTEDIR', d, 1)
- import re
+ 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 defined")
- bb.data.setVar('SRC', s, d)
- bb.data.setVar('SRC_DISTRIBUTEDIR', "%s/%s" % (sources_dir, entry), d)
- bb.build.exec_func('SRC_DISTRIBUTECOMMAND', d)
+ 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)
}
-addtask distribute_sources before do_build after do_fetch
+addtask distribute_sources_all after do_distribute_sources
+do_distribute_sources_all[recrdeptask] = "do_distribute_sources"
+do_distribute_sources_all[nostamp] = "1"
-addtask distsrcall after do_distribute_sources
-do_distsrcall[recrdeptask] = "do_distribute_sources"
-base_do_distsrcall() {
- :
-}
+# compatability wrapper
+addtask distsrcall after do_distribute_sources_all
+do_distsrcall[nostamp] = "1"