summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-01 00:06:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-01 00:10:56 +0000
commitf8ca2383e1a5f69ef3f24b5436b3302e7a2e576e (patch)
tree907259c3ed1b443c21833f39049e5efc1ebc259c /meta/classes
parentdfc6ccefed4530b06aaf90d149c0df6cf6177688 (diff)
downloadpoky-f8ca2383e1a5f69ef3f24b5436b3302e7a2e576e.tar.gz
base/utility-tasks.bbclass: Drop do_setscene and do_rebuild
The do_setscene task only exists for rebuild support now as all its other functionality has been superceeded. The rebuild task currently crashes due to removal of the working directory and therefore isn't working for anyone. It also interacts extremely badly with the newer sstate technology to the point of being dangerous. Summary, if we want rebuild support it needs a reimplementation so remove this version and all its remnants and hacks. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass31
-rw-r--r--meta/classes/utility-tasks.bbclass19
2 files changed, 1 insertions, 49 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index a674f52fb2..300981010a 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -97,23 +97,6 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/$
97# in the context of the location its used (:=) 97# in the context of the location its used (:=)
98THISDIR = "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" 98THISDIR = "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
99 99
100SCENEFUNCS += "base_scenefunction"
101
102python base_scenefunction () {
103 stamp = bb.data.getVar('STAMP', d, 1) + ".needclean"
104 if os.path.exists(stamp):
105 bb.build.exec_func("do_clean", d)
106}
107
108python base_do_setscene () {
109 for f in (bb.data.getVar('SCENEFUNCS', d, 1) or '').split():
110 bb.build.exec_func(f, d)
111 if not os.path.exists(bb.build.stampfile("do_setscene", d)):
112 bb.build.make_stamp("do_setscene", d)
113}
114do_setscene[selfstamp] = "1"
115addtask setscene before do_fetch
116
117addtask fetch 100addtask fetch
118do_fetch[dirs] = "${DL_DIR}" 101do_fetch[dirs] = "${DL_DIR}"
119python base_do_fetch() { 102python base_do_fetch() {
@@ -219,18 +202,6 @@ python base_eventhandler() {
219 if pesteruser: 202 if pesteruser:
220 bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) 203 bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser))
221 204
222 #
223 # Handle removing stamps for 'rebuild' task
224 #
225 if name.startswith("StampUpdate"):
226 for (fn, task) in e.targets:
227 #print "%s %s" % (task, fn)
228 if task == "do_rebuild":
229 dir = "%s.*" % e.stampPrefix[fn]
230 bb.note("Removing stamps: " + dir)
231 os.system('rm -f '+ dir)
232 os.system('touch ' + e.stampPrefix[fn] + '.needclean')
233
234 if name == "ConfigParsed": 205 if name == "ConfigParsed":
235 generate_git_config(e) 206 generate_git_config(e)
236 207
@@ -481,4 +452,4 @@ python do_cleanall() {
481do_cleanall[nostamp] = "1" 452do_cleanall[nostamp] = "1"
482 453
483 454
484EXPORT_FUNCTIONS do_setscene do_fetch do_unpack do_configure do_compile do_install do_package 455EXPORT_FUNCTIONS do_fetch do_unpack do_configure do_compile do_install do_package
diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index aeac2bce40..64bd84a5d3 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -28,25 +28,6 @@ python do_clean() {
28 bb.build.exec_func(f, d) 28 bb.build.exec_func(f, d)
29} 29}
30 30
31addtask rebuild after do_${BB_DEFAULT_TASK}
32do_rebuild[dirs] = "${TOPDIR}"
33do_rebuild[nostamp] = "1"
34python do_rebuild() {
35 """rebuild a package"""
36}
37
38#addtask mrproper
39#do_mrproper[dirs] = "${TOPDIR}"
40#do_mrproper[nostamp] = "1"
41#python do_mrproper() {
42# """clear downloaded sources, build and temp directories"""
43# dir = bb.data.expand("${DL_DIR}", d)
44# if dir == '/': bb.build.FuncFailed("wrong DATADIR")
45# bb.debug(2, "removing " + dir)
46# os.system('rm -rf ' + dir)
47# bb.build.exec_func('do_clean', d)
48#}
49
50addtask checkuri 31addtask checkuri
51do_checkuri[nostamp] = "1" 32do_checkuri[nostamp] = "1"
52python do_checkuri() { 33python do_checkuri() {