Revert "base/utility-tasks.bbclass: Drop do_setscene and do_rebuild"

This reverts commit 6d7976542019bc27886470e6ec1aac9ed84dd0e1.

The orignal patch broke the incremental build, so not all is right
with this change yet.

Signed-off-by: Saul Wold <sgw@linux.intel.com>

2 files changed, 49 insertions, 1 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 300981010a..a674f52fb2 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -97,6 +97,23 @@ 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() {
@@ -202,6 +219,18 @@ 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)
 
@@ -452,4 +481,4 @@ python do_cleanall() {
 do_cleanall[nostamp] = "1"
 
 
-EXPORT_FUNCTIONS do_fetch do_unpack do_configure do_compile do_install do_package
+EXPORT_FUNCTIONS do_setscene 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 64bd84a5d3..aeac2bce40 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -28,6 +28,25 @@ 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() {