mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 03:49:32 +02:00
populate_sdk_ext: Update to toolcfg.conf
Add handling for toolcfg to the eSDK generation. Take the opporunity to clean up the code duplication too. (From OE-Core rev: ba8a64935f43bfda92a11758b13590bbb3632ff2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -317,15 +317,10 @@ def write_local_conf(d, baseoutpath, derivative, core_meta_subdir, uninative_che
|
|||||||
return origvalue, op, 0, True
|
return origvalue, op, 0, True
|
||||||
varlist = ['[^#=+ ]*']
|
varlist = ['[^#=+ ]*']
|
||||||
oldlines = []
|
oldlines = []
|
||||||
if os.path.exists(builddir + '/conf/site.conf'):
|
for conffile in ['site.conf', 'auto.conf', 'toolcfg.conf', 'local.conf']:
|
||||||
with open(builddir + '/conf/site.conf', 'r') as f:
|
if os.path.exists(builddir + '/conf/' + conffile):
|
||||||
oldlines += f.readlines()
|
with open(builddir + '/conf/' + conffile, 'r') as f:
|
||||||
if os.path.exists(builddir + '/conf/auto.conf'):
|
oldlines += f.readlines()
|
||||||
with open(builddir + '/conf/auto.conf', 'r') as f:
|
|
||||||
oldlines += f.readlines()
|
|
||||||
if os.path.exists(builddir + '/conf/local.conf'):
|
|
||||||
with open(builddir + '/conf/local.conf', 'r') as f:
|
|
||||||
oldlines += f.readlines()
|
|
||||||
(updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var)
|
(updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var)
|
||||||
|
|
||||||
with open(baseoutpath + '/conf/local.conf', 'w') as f:
|
with open(baseoutpath + '/conf/local.conf', 'w') as f:
|
||||||
|
|||||||
Reference in New Issue
Block a user