fix archiver missing tasks between do_unpack and do_patch

index b598aa3..d52fe99 100644
@@ -269,6 +269,113 @@ def create_diff_gz(d, src_orig, src, ar_outdir):
     subprocess.call(diff_cmd, shell=True)
     bb.utils.remove(src_patched, recurse=True)
 
+# It helps to compute task dependencies between begin and end.
+# Here is an example, in a recipe we insert four tasks between do_patch
+# and do_unpack:
+# addtask test1 after do_unpack before do_patch
+# addtask test2 after do_unpack before do_test1
+# addtask test3 after do_test2 before do_test1
+# addtask test4 after do_test2 before do_test1
+#
+# We want to list the order of task dependencies:
+# ['do_unpack', 'do_test2', 'do_test3', 'do_test4', 'do_test1', 'do_patch']
+def list_sorted_tasks(begin, end, d):
+    parent_graph = construct_parent_graph(begin, end, d)
+
+    # Sort tasks according to the number of parent tasks incrementally
+    return [x[0] for x in sorted(parent_graph.iteritems(), key = lambda d:len(d[1]))]
+
+# List all parents for each tasks, such as:
+# From
+# task_deps = {
+#   'do_patch': ['do_test1', 'do_unpack'],
+#   'do_test1': ['do_test4', 'do_test3', 'do_test2', 'do_unpack']
+#   'do_test2': ['do_unpack'],
+#   'do_test3': ['do_test2'],
+#   'do_test4': ['do_test2']
+# }
+# to the parent graph we counstruct:
+# parent_graph = {
+#   'do_patch': ['do_test1', 'do_test2', 'do_test3', 'do_test4', 'do_unpack'],
+#   'do_test1': ['do_test4', 'do_test3', 'do_test2', 'do_unpack'],
+#   'do_test2': ['do_unpack'],
+#   'do_test3': ['do_test2', 'do_unpack'],
+#   'do_test4': ['do_test2', 'do_unpack'],
+#   'do_unpack': []
+# }
+#
+# We are not care about circualar dependency, the bitbake parser will do the
+# checking.
+def construct_parent_graph(begin, end, d):
+    task_deps = construct_task_deps(d)
+    def list_parents(task):
+        if task == begin:
+            return []
+        parents = task_deps[task]
+        for ptask in task_deps[task]:
+            parents += [x for x in list_parents(ptask) if x not in parents]
+        return parents
+
+    parent_graph = dict()
+    # All the tasks we need listed in the end's parent
+    end_parent = list_parents(end)
+    parent_graph[end] = end_parent
+    for task in end_parent:
+        parent_graph[task] = list_parents(task)
+
+    return parent_graph
+
+# Construct task_deps from BB_TASKDEPDATA, it lists parents for each
+# task within the current recipe, such as:
+# From
+# BB_TASKDEPDATA = {
+#   0: ['gzip', 'do_test1', '**/gzip_1.6.bb', set([1, 18, 19, 20])],
+#   1: ['gzip', 'do_unpack', '**/gzip_1.6.bb', set([5, 6])],
+#   2: ['gzip', 'do_patch', '**/gzip_1.6.bb', set([0, 1, 24])],
+#   ...
+#   5: ['gzip', 'do_fetch', '**/gzip_1.6.bb', set([])],
+#   6: ['gzip', 'do_wrlbuildlink', '**/gzip_1.6.bb', set([])],
+#   ...
+#   14: ['gzip', 'do_unpack_and_patch', '**/gzip_1.6.bb', set([2, 14])]
+#   ...
+#   18: ['gzip', 'do_test4', '**/gzip_1.6.bb', set([20])],
+#   19: ['gzip', 'do_test3', '**/gzip_1.6.bb', set([20])],
+#   20: ['gzip', 'do_test2', '**/gzip_1.6.bb', set([1])],
+#   ...
+#   24: ['quilt-native', 'do_populate_sysroot', '**/quilt-native_0.63.bb', set([23])],
+# }
+# to the task deps we counstruct:
+# task_deps = {
+#   'do_test2': ['do_unpack'],
+#   'do_test3': ['do_test2'],
+#   'do_fetch': [],
+#   'do_test1': ['do_unpack', 'do_test4', 'do_test3', 'do_test2'],
+#   'do_test4': ['do_test2'],
+#   'do_patch': ['do_test1', 'do_unpack'],
+#   'do_unpack_and_patch': ['do_patch'],
+#   'do_unpack': ['do_fetch', 'do_wrlbuildlink'],
+#   'do_wrlbuildlink': []
+# }
+def construct_task_deps(d):
+    taskdepdata = d.getVar('BB_TASKDEPDATA', True)
+    pn = d.getVar('PN', True)
+    task_deps = dict()
+    for task_id in taskdepdata:
+        # Filter out dep task which is not in the current recipe
+        if pn != taskdepdata[task_id][0]:
+            continue
+
+        task =  taskdepdata[task_id][1]
+        dep_ids = taskdepdata[task_id][3]
+        task_deps[task] = list()
+        for dep_id in dep_ids:
+            if pn != taskdepdata[dep_id][0] or dep_id == task_id:
+                continue
+            dep_task = taskdepdata[dep_id][1]
+            task_deps[task].append(dep_task)
+
+    return task_deps
+
 # Run do_unpack and do_patch
 python do_unpack_and_patch() {
     if d.getVarFlag('ARCHIVER_MODE', 'src', True) not in \

@@ -286,13 +393,11 @@ python do_unpack_and_patch() {
     # do_patch required 'B' existed).
     bb.utils.mkdirhier(d.getVar('B', True))
 
-    # The kernel source is ready after do_validate_branches
-    if bb.data.inherits_class('kernel-yocto', d):
-        bb.build.exec_func('do_unpack', d)
-        bb.build.exec_func('do_kernel_checkout', d)
-        bb.build.exec_func('do_validate_branches', d)
-    else:
-        bb.build.exec_func('do_unpack', d)
+    tasks = list_sorted_tasks('do_unpack', 'do_patch', d)
+    bb.note('execute %s in do_unpack_and_patch' % tasks)
+    # Do not execute 'do_patch' here
+    for task in tasks[0:-1]:
+        bb.build.exec_func(task, d)
 
     # Save the original source for creating the patches
     if d.getVarFlag('ARCHIVER_MODE', 'diff', True) == '1':