summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-03-04 00:28:55 +0000
committerRichard Purdie <richard@openedhand.com>2008-03-04 00:28:55 +0000
commit98555dd5a0d0e5285b10490c003937e39f389d47 (patch)
treea428a0631947143835759a0774160b5a60348dc6
parent1a59c52aec5f98c73541e9475d69cfe705bd978a (diff)
downloadopenembedded-core-98555dd5a0d0e5285b10490c003937e39f389d47.tar.gz
openembedded-core-98555dd5a0d0e5285b10490c003937e39f389d47.tar.bz2
openembedded-core-98555dd5a0d0e5285b10490c003937e39f389d47.zip
bitbake: Sync bbimage with upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3895 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xbitbake/bin/bbimage5
1 files changed, 5 insertions, 0 deletions
diff --git a/bitbake/bin/bbimage b/bitbake/bin/bbimage
index fdc417617b..96b7dca323 100755
--- 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 = []