summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cooker.py17
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:
707 if (task == None): 707 if (task == None):
708 task = self.configuration.cmd 708 task = self.configuration.cmd
709 709
710 (fn, cls) = bb.cache.Cache.virtualfn2realfn(buildfile) 710 fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile)
711 fn = os.path.abspath(fn)
711 buildfile = self.matchFile(fn) 712 buildfile = self.matchFile(fn)
712 fn = bb.cache.Cache.realfn2virtual(buildfile, cls)
713 713
714 self.buildSetVars() 714 self.buildSetVars()
715 715
716 self.status = bb.cache.CacheData() 716 self.status = bb.cache.CacheData()
717 infos = bb.cache.Cache.parse(fn, self.get_file_appends(fn), \ 717 infos = bb.cache.Cache.parse(fn, self.get_file_appends(fn), \
718 self.configuration.data) 718 self.configuration.data)
719 maininfo = None 719 infos = dict(infos)
720 for vfn, info in infos: 720
721 self.status.add_from_recipeinfo(vfn, info) 721 fn = bb.cache.Cache.realfn2virtual(buildfile, cls)
722 if vfn == fn: 722 try:
723 maininfo = info 723 maininfo = infos[fn]
724 except KeyError:
725 bb.fatal("%s does not exist" % fn)
726 self.status.add_from_recipeinfo(fn, maininfo)
724 727
725 # Tweak some variables 728 # Tweak some variables
726 item = maininfo.pn 729 item = maininfo.pn