summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-12-19 23:35:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-20 14:53:55 +0000
commit801745d918e83f976c706f29669779f5b292ade3 (patch)
treef6ebc1abf7dc824f1babfeb341d4fbdb8d6607ac /meta
parent32e92bbe7f4cc5e1e6de3460fb0aaaef5cbfc88a (diff)
downloadpoky-801745d918e83f976c706f29669779f5b292ade3.tar.gz
populate_sdk_ext.bbclass: Include site.conf in parsing for contents for local.conf
Some distros use site.conf to emit certain variables which are important for eSDK e.g. DISTRO with out which eSDK will not be able to ger right metadata when it tries to build (From OE-Core rev: 95659bed3f6f3216b346f70cfc9ffae9788c0fc1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index e30c49296d..40b0375e0b 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -280,6 +280,8 @@ python copy_buildsystem () {
280 280
281 # Create local.conf 281 # Create local.conf
282 builddir = d.getVar('TOPDIR') 282 builddir = d.getVar('TOPDIR')
283 if derivative and os.path.exists(builddir + '/conf/site.conf'):
284 shutil.copyfile(builddir + '/conf/site.conf', baseoutpath + '/conf/site.conf')
283 if derivative and os.path.exists(builddir + '/conf/auto.conf'): 285 if derivative and os.path.exists(builddir + '/conf/auto.conf'):
284 shutil.copyfile(builddir + '/conf/auto.conf', baseoutpath + '/conf/auto.conf') 286 shutil.copyfile(builddir + '/conf/auto.conf', baseoutpath + '/conf/auto.conf')
285 if derivative: 287 if derivative:
@@ -297,6 +299,9 @@ python copy_buildsystem () {
297 return origvalue, op, 0, True 299 return origvalue, op, 0, True
298 varlist = ['[^#=+ ]*'] 300 varlist = ['[^#=+ ]*']
299 oldlines = [] 301 oldlines = []
302 if os.path.exists(builddir + '/conf/site.conf'):
303 with open(builddir + '/conf/site.conf', 'r') as f:
304 oldlines += f.readlines()
300 if os.path.exists(builddir + '/conf/auto.conf'): 305 if os.path.exists(builddir + '/conf/auto.conf'):
301 with open(builddir + '/conf/auto.conf', 'r') as f: 306 with open(builddir + '/conf/auto.conf', 'r') as f:
302 oldlines += f.readlines() 307 oldlines += f.readlines()