summaryrefslogtreecommitdiffstats
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 11:18:21 +0000
commitc0a22d4f81caf615b348fce154072b95d1144128 (patch)
tree22b2bea3e62bf91db89ea791af78694a98e49287
parent044f0acab44acdeb363684215fbbb851bad53808 (diff)
downloadopenembedded-core-contrib-c0a22d4f81caf615b348fce154072b95d1144128.tar.gz
openembedded-core-contrib-c0a22d4f81caf615b348fce154072b95d1144128.tar.bz2
openembedded-core-contrib-c0a22d4f81caf615b348fce154072b95d1144128.zip
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 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 () {
# Create local.conf
builddir = d.getVar('TOPDIR')
+ if derivative and os.path.exists(builddir + '/conf/site.conf'):
+ shutil.copyfile(builddir + '/conf/site.conf', baseoutpath + '/conf/site.conf')
if derivative and os.path.exists(builddir + '/conf/auto.conf'):
shutil.copyfile(builddir + '/conf/auto.conf', baseoutpath + '/conf/auto.conf')
if derivative:
@@ -297,6 +299,9 @@ python copy_buildsystem () {
return origvalue, op, 0, True
varlist = ['[^#=+ ]*']
oldlines = []
+ if os.path.exists(builddir + '/conf/site.conf'):
+ with open(builddir + '/conf/site.conf', 'r') as f:
+ oldlines += f.readlines()
if os.path.exists(builddir + '/conf/auto.conf'):
with open(builddir + '/conf/auto.conf', 'r') as f:
oldlines += f.readlines()