From: Chris Larson <chris_larson@mentor.com>
Date: Tue, 23 Feb 2010 18:55:43 +0000 (-0700)
Subject: Re-getVar BBCLASSEXTEND after finalise()
X-Git-Tag: 2011-1~6128
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d8b12d4eea4d03c2d8870be1a4abd9c8eaeb5b3d;p=openembedded-core.git

Re-getVar BBCLASSEXTEND after finalise()

This ensures that an anonymous python function is able to manipulate the
BBCLASSEXTEND contents, and, therefore, amend.inc files are able to add to it.

(Bitbake rev: c7d038d404afaf4ce3735af5134163759da6f6ef)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 1ba81886a7..ea3478ce3a 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -152,8 +152,7 @@ def handle(fn, d, include):
         classes.remove(__classname__)
     else:
         if include == 0:
-            multi = data.getVar('BBCLASSEXTEND', d, 1)
-            if multi:
+            if data.getVar('BBCLASSEXTEND', d, 1):
                 based = bb.data.createCopy(d)
             else:
                 based = d
@@ -163,7 +162,7 @@ def handle(fn, d, include):
                 bb.data.setVar("__SKIPPED", True, based)
             darray = {"": based}
 
-            for cls in (multi or "").split():
+            for cls in (data.getVar('BBCLASSEXTEND', based, 1) or "").split():
                 pn = data.getVar('PN', d, True)
                 based = bb.data.createCopy(d)
                 data.setVar('PN', pn + '-' + cls, based)