diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-02-19 22:41:58 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-21 09:32:01 +0000 |
| commit | b53edb86c65ad375df153017f245244ef97f3932 (patch) | |
| tree | c4997c346512937fde9c500add7b7f6f7e681043 | |
| parent | 2ddad52ccca07245eea43d9b844c6c7d4b667ca3 (diff) | |
| download | openembedded-core-b53edb86c65ad375df153017f245244ef97f3932.tar.gz openembedded-core-b53edb86c65ad375df153017f245244ef97f3932.tar.bz2 openembedded-core-b53edb86c65ad375df153017f245244ef97f3932.zip | |
classes/populate_sdk_ext: add a better config extension mechanism
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 1c1bb47687..a6badb84c6 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -188,7 +188,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 |