mirror of
https://git.yoctoproject.org/poky
synced 2026-04-03 02:02:21 +02:00
populate_sdk_ext: use SDK_CUSTOM_TEPLATECONF variable to enable custom templateconf.cfg
The current implementation will always pick an existing templateconf.cfg if present else it will use the one from OE. A user might not always want to pick an existing tempalteconf.cfg even if its present. Introduce SDK_CUSTOM_TEMPLATECONF variable to provide an option for the user to specify if he wants to use an existing custom templateconf.cfg or not If SDK_CUSTOM_TEMPLATECONF=='1' then enable custom templateconf.cfg. By default SDK_CUSTOM_TEMPLATECONF is set to '0' (From OE-Core rev: d0f863a24d05bddeb21e181fb01fa0051c79d7d8) Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
723a7f48ca
commit
a334a8c67f
@@ -24,6 +24,7 @@ SDK_INCLUDE_NATIVESDK ?= "0"
|
||||
SDK_INCLUDE_BUILDTOOLS ?= '1'
|
||||
|
||||
SDK_RECRDEP_TASKS ?= ""
|
||||
SDK_CUSTOM_TEMPLATECONF ?= "0"
|
||||
|
||||
SDK_LOCAL_CONF_WHITELIST ?= ""
|
||||
SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \
|
||||
@@ -199,6 +200,9 @@ python copy_buildsystem () {
|
||||
buildsystem = oe.copy_buildsystem.BuildSystem('extensible SDK', d)
|
||||
baseoutpath = d.getVar('SDK_OUTPUT') + '/' + d.getVar('SDKPATH')
|
||||
|
||||
#check if custome templateconf path is set
|
||||
use_custom_templateconf = d.getVar('SDK_CUSTOM_TEMPLATECONF')
|
||||
|
||||
# Determine if we're building a derivative extensible SDK (from devtool build-sdk)
|
||||
derivative = (d.getVar('SDK_DERIVATIVE') or '') == '1'
|
||||
if derivative:
|
||||
@@ -390,7 +394,7 @@ python copy_buildsystem () {
|
||||
shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat')
|
||||
|
||||
# Use templateconf.cfg file from builddir if exists
|
||||
if os.path.exists(builddir + '/conf/templateconf.cfg'):
|
||||
if os.path.exists(builddir + '/conf/templateconf.cfg') and use_custom_templateconf == '1':
|
||||
shutil.copyfile(builddir + '/conf/templateconf.cfg', baseoutpath + '/conf/templateconf.cfg')
|
||||
else:
|
||||
# Write a templateconf.cfg
|
||||
|
||||
Reference in New Issue
Block a user