cooker: fix -b with BBCLASSEXTEND

(Bitbake rev: 58bdaeb679d3c84cda827a33d09ce543547c45b4)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 10 insertions, 7 deletions

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 78ac68e418..a1cd4d750e 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -707,20 +707,23 @@ class BBCooker:
         if (task == None):
             task = self.configuration.cmd
 
-        (fn, cls) = bb.cache.Cache.virtualfn2realfn(buildfile)
+        fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile)
+        fn = os.path.abspath(fn)
         buildfile = self.matchFile(fn)
-        fn = bb.cache.Cache.realfn2virtual(buildfile, cls)
 
         self.buildSetVars()
 
         self.status = bb.cache.CacheData()
         infos = bb.cache.Cache.parse(fn, self.get_file_appends(fn), \
                                      self.configuration.data)
-        maininfo = None
-        for vfn, info in infos:
-            self.status.add_from_recipeinfo(vfn, info)
-            if vfn == fn:
-                maininfo = info
+        infos = dict(infos)
+
+        fn = bb.cache.Cache.realfn2virtual(buildfile, cls)
+        try:
+            maininfo = infos[fn]
+        except KeyError:
+            bb.fatal("%s does not exist" % fn)
+        self.status.add_from_recipeinfo(fn, maininfo)
 
         # Tweak some variables
         item = maininfo.pn