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)

(From OE-Core rev: d2f802b656dea7f9c227bd86db35e02c33f69021)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj authored and Richard Purdie committed 2019-01-08 20:14:44 +00:00
1 parent c9bffece78
commit a4e7bb5346
1 file changed
+5
+5
View File
@@ -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()