[PATCH 0/1] Improve ext SDK config extension mechanism

[PATCH 0/1] Improve ext SDK config extension mechanism

[Paul Eggleton]

The following changes since commit 58b45240739da210ef2fecea931c8b8daa9a4c07:

  epiphany: Add libxml2-native to DEPENDS (2016-02-18 22:55:12 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/extsdkfixes6-oe
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/extsdkfixes6-oe

Paul Eggleton (1):
  classes/populate_sdk_ext: add a better config extension mechanism

 meta/classes/populate_sdk_ext.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)

-- 
2.5.0

[PATCH 1/1] classes/populate_sdk_ext: add a better config extension mechanism

[Paul Eggleton]

The sdk_extraconf() method of setting the configuration was awkward
since you needed to set it in a class and then inherit that class since
function definitions aren't allowed in conf files. It seemed to me the
a neater way to do this was to read the extra lines from an additional
conf file sdk-extra.conf (which can be located in a conf/ directory
anywhere along BBPATH as with other configuration files).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/populate_sdk_ext.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 6e36642..ad12b66 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -175,7 +175,15 @@ python copy_buildsystem () {
         # Hide the config information from bitbake output (since it's fixed within the SDK)
         f.write('BUILDCFG_HEADER = ""\n')
 
+        # Allow additional config through sdk-extra.conf
+        fn = bb.cookerdata.findConfigFile('sdk-extra.conf', d)
+        if fn:
+            with open(fn, 'r') as xf:
+                for line in xf:
+                    f.write(line)
+
         # If you define a sdk_extraconf() function then it can contain additional config
+        # (Though this is awkward; sdk-extra.conf should probably be used instead)
         extraconf = (d.getVar('sdk_extraconf', True) or '').strip()
         if extraconf:
             # Strip off any leading / trailing spaces
-- 
2.5.0