summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_ext.bbclass
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2020-03-06 16:32:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-07 10:06:16 +0000
commit75bebb354642d0f87e90770091f18dfeb4c30471 (patch)
tree58f2896eeaa3ad46c310b25598ad82ca58c7b951 /meta/classes/populate_sdk_ext.bbclass
parenta1baa2b51edf6a676c8c266aa3efffcb96102208 (diff)
downloadpoky-75bebb354642d0f87e90770091f18dfeb4c30471.tar.gz
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 <andrej.valek@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass10
1 files changed, 7 insertions, 3 deletions
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 () {
388 bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache')) 388 bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache'))
389 shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat') 389 shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat')
390 390
391 # Write a templateconf.cfg 391 # Use templateconf.cfg file from builddir if exists
392 with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: 392 if os.path.exists(builddir + '/conf/templateconf.cfg'):
393 f.write('meta/conf\n') 393 shutil.copyfile(builddir + '/conf/templateconf.cfg', baseoutpath + '/conf/templateconf.cfg')
394 else:
395 # Write a templateconf.cfg
396 with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f:
397 f.write('meta/conf\n')
394 398
395 # Ensure any variables set from the external environment (by way of 399 # Ensure any variables set from the external environment (by way of
396 # BB_ENV_EXTRAWHITE) are set in the SDK's configuration 400 # BB_ENV_EXTRAWHITE) are set in the SDK's configuration