[oe-commits] [openembedded-core] 90/92: populate_sdk_ext.bbclass: Include site.conf in parsing for contents for local.conf

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch thud
in repository openembedded-core.

commit d2f802b656dea7f9c227bd86db35e02c33f69021
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Wed Dec 19 23:35:02 2018 -0800

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/populate_sdk_ext.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index e30c492..40b0375 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()

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.