From 75bebb354642d0f87e90770091f18dfeb4c30471 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Fri, 6 Mar 2020 16:32:33 +0100 Subject: populate_sdk_ext: enable custom templateconf.cfg Do not always override templateconf.cfg content. Add option to use already existing file. (From OE-Core rev: e524e49ef22fd69882d5d2d01cd84db790e9cb88) Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/classes/populate_sdk_ext.bbclass') diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 57fd29b1bb..9f26cfc131 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -388,9 +388,13 @@ python copy_buildsystem () { bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache')) shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat') - # Write a templateconf.cfg - with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: - f.write('meta/conf\n') + # Use templateconf.cfg file from builddir if exists + if os.path.exists(builddir + '/conf/templateconf.cfg'): + shutil.copyfile(builddir + '/conf/templateconf.cfg', baseoutpath + '/conf/templateconf.cfg') + else: + # Write a templateconf.cfg + with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: + f.write('meta/conf\n') # Ensure any variables set from the external environment (by way of # BB_ENV_EXTRAWHITE) are set in the SDK's configuration -- cgit v1.2.3-54-g00ecf