1 files changed, 8 insertions, 6 deletions

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index e88ad24cf6..938b999b4f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -2067,8 +2067,9 @@ class Parser(multiprocessing.Process):
 
                 jobid = None
                 try:
-                    jobid = self.jobid_queue.get(True, 0.5)
-                except (ValueError, OSError):
+                    # Have to wait for all parsers to have forked
+                    jobid = self.jobid_queue.get(True, 5)
+                except (ValueError, OSError, queue.Empty):
                     havejobs = False
 
                 if jobid is not None:
@@ -2171,15 +2172,16 @@ class CookerParser(object):
             self.parser_quit = multiprocessing.Event()
             self.result_queue = multiprocessing.Queue()
 
-            for jobid in range(len(self.willparse)):
-                self.toparse_queue.put(jobid)
-
+            # Have to pass in willparse at fork time so all parsing processes have the unpickleable data
+            # then access it by index from the parse queue.
             for i in range(0, self.num_processes):
                 parser = Parser(self.willparse, self.toparse_queue, self.result_queue, self.parser_quit, self.cooker.configuration.profile)
                 parser.start()
                 self.process_names.append(parser.name)
                 self.processes.append(parser)
 
+            for jobid in range(len(self.willparse)):
+                self.toparse_queue.put(jobid)
             self.toparse_queue.close()
 
             self.results = itertools.chain(self.results, self.parse_generator())
@@ -2290,7 +2292,7 @@ class CookerParser(object):
                 yield result
 
         if not (self.parsed >= self.toparse):
-            raise bb.parse.ParseError("Not all recipes parsed, parser thread killed/died? Exiting.", None)
+            raise bb.parse.ParseError("Not all recipes parsed, parser thread killed/died? (%s %s of %s) Exiting." % (len(self.processes), self.parsed, self.toparse), None)
 
 
     def parse_next(self):