runqueue.py: Renable check_stamp_fn() for now since we still fork for task execution (as per bitbake-upstream)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 10 insertions, 14 deletions

diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index a508d137c8..a46527505f 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1106,15 +1106,11 @@ class RunQueueExecute:
             # No stdin
             newsi = os.open(os.devnull, os.O_RDWR)
             os.dup2(newsi, sys.stdin.fileno())
-            # Stdout to a logfile
-            #logout = data.expand("${TMPDIR}/log/stdout.%s" % os.getpid(), self.cfgData, True)
-            #mkdirhier(os.path.dirname(logout))
-            #newso = open(logout, 'w')
-            #os.dup2(newso.fileno(), sys.stdout.fileno())
-            #os.dup2(newso.fileno(), sys.stderr.fileno())
             if quieterrors:
                 the_data.setVarFlag(taskname, "quieterrors", "1")
 
+            bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data)
+            bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", fn, self.cooker.configuration.data)
             bb.data.setVar("BB_WORKERCONTEXT", "1", the_data)
             bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps)
 
@@ -1618,14 +1614,14 @@ class runQueueTaskCompleted(runQueueEvent):
     Event notifing a task completed
     """
 
-#def check_stamp_fn(fn, taskname, d):
-#    rqexe = bb.data.getVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", d)
-#    fn = bb.data.getVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", d)
-#    fnid = rqexe.rqdata.taskData.getfn_id(fn)
-#    taskid = rqexe.rqdata.get_task_id(fnid, taskname)
-#    if taskid is not None:
-#        return rqexe.rq.check_stamp_task(taskid)
-#    return None
+def check_stamp_fn(fn, taskname, d):
+    rqexe = bb.data.getVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", d)
+    fn = bb.data.getVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY2", d)
+    fnid = rqexe.rqdata.taskData.getfn_id(fn)
+    taskid = rqexe.rqdata.get_task_id(fnid, taskname)
+    if taskid is not None:
+        return rqexe.rq.check_stamp_task(taskid)
+    return None
 
 class runQueuePipe():
     """