bitbake: Sync bbimage with upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3895 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/bitbake/bin/bbimage b/bitbake/bin/bbimage
index fdc417617b1516d5036a34c46ee086ff624576fd..96b7dca323e04a18116af77df5b27d3d967f9e6c 100755 (executable)
--- a/bitbake/bin/bbimage
+++ b/bitbake/bin/bbimage
@@ -79,6 +79,11 @@ if cfg_bb is None:
     fatal("Unable to open/parse %s" % os.path.join('conf', 'bitbake.conf'))
     usage(1)
 
+# Handle any INHERITs and inherit the base class
+inherits  = ["base"] + (bb.data.getVar('INHERIT', cfg_bb, True ) or "").split()
+for inherit in inherits:
+    cfg_bb = bb.parse.handle(os.path.join('classes', '%s.bbclass' % inherit), cfg_bb, True )
+
 rootfs = None
 extra_files = []