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>

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index a674f52fb2b615e3e357035400a0b7c550b9c29d..300981010aa7dbf60d5f12a653949f5819d8ef67 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -97,23 +97,6 @@ FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/$
 # in the context of the location its used (:=)
 THISDIR = "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 
-SCENEFUNCS += "base_scenefunction"
-       
-python base_scenefunction () {
-       stamp = bb.data.getVar('STAMP', d, 1) + ".needclean"
-       if os.path.exists(stamp):
-               bb.build.exec_func("do_clean", d)
-}
-
-python base_do_setscene () {
-       for f in (bb.data.getVar('SCENEFUNCS', d, 1) or '').split():
-               bb.build.exec_func(f, d)
-       if not os.path.exists(bb.build.stampfile("do_setscene", d)):
-               bb.build.make_stamp("do_setscene", d)
-}
-do_setscene[selfstamp] = "1"
-addtask setscene before do_fetch
-
 addtask fetch
 do_fetch[dirs] = "${DL_DIR}"
 python base_do_fetch() {
@@ -219,18 +202,6 @@ python base_eventhandler() {
                if pesteruser:
                        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))
 
-       #
-       # Handle removing stamps for 'rebuild' task
-       #
-       if name.startswith("StampUpdate"):
-               for (fn, task) in e.targets:
-                       #print "%s %s" % (task, fn)
-                       if task == "do_rebuild":
-                               dir = "%s.*" % e.stampPrefix[fn]
-                               bb.note("Removing stamps: " + dir)
-                               os.system('rm -f '+ dir)
-                               os.system('touch ' + e.stampPrefix[fn] + '.needclean')
-
         if name == "ConfigParsed":
                 generate_git_config(e)
 
@@ -481,4 +452,4 @@ python do_cleanall() {
 do_cleanall[nostamp] = "1"
 
 
-EXPORT_FUNCTIONS do_setscene do_fetch do_unpack do_configure do_compile do_install do_package
+EXPORT_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 aeac2bce403b70bc55ece0ef7f5c17da568c4370..64bd84a5d3bd1781a938cad2d137ce52d7f3f44c 100644 (file)
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -28,25 +28,6 @@ python do_clean() {
                bb.build.exec_func(f, d)
 }
 
-addtask rebuild after do_${BB_DEFAULT_TASK}
-do_rebuild[dirs] = "${TOPDIR}"
-do_rebuild[nostamp] = "1"
-python do_rebuild() {
-       """rebuild a package"""
-}
-
-#addtask mrproper
-#do_mrproper[dirs] = "${TOPDIR}"
-#do_mrproper[nostamp] = "1"
-#python do_mrproper() {
-#      """clear downloaded sources, build and temp directories"""
-#      dir = bb.data.expand("${DL_DIR}", d)
-#      if dir == '/': bb.build.FuncFailed("wrong DATADIR")
-#      bb.debug(2, "removing " + dir)
-#      os.system('rm -rf ' + dir)
-#      bb.build.exec_func('do_clean', d)
-#}
-
 addtask checkuri
 do_checkuri[nostamp] = "1"
 python do_checkuri() {