diff options
| author | Chris Larson <chris_larson@mentor.com> | 2011-04-04 14:37:59 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-06 15:37:39 +0100 |
| commit | 628bd54d936650d03ba2ffd0a08aade2f84529b1 (patch) | |
| tree | 925f590f7b37f9c1d4384f0e12278f318cfb64c9 /bitbake | |
| parent | 607432947cbd3df512e436ba84792cb94a2ed478 (diff) | |
| download | ast2050-yocto-poky-628bd54d936650d03ba2ffd0a08aade2f84529b1.zip ast2050-yocto-poky-628bd54d936650d03ba2ffd0a08aade2f84529b1.tar.gz | |
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>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 78ac68e..a1cd4d7 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 |
