From a4e7bb534610707de4f995fd1e66ec3dbd258199 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 19 Dec 2018 23:35:02 -0800 Subject: 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 Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/classes') 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() -- cgit v1.2.3-54-g00ecf