From: Paul Eggleton Date: Fri, 19 Feb 2016 09:41:58 +0000 (+1300) Subject: classes/populate_sdk_ext: add a better config extension mechanism X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~26879 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b53edb86c65ad375df153017f245244ef97f3932;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 1c1bb47687e..a6badb84c66 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