diff options
author | Chandana kalluri <ckalluri@xilinx.com> | 2020-12-03 15:30:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-18 23:01:48 +0000 |
commit | 28530c28f9384a1baf48483db4664cf444ec7ea3 (patch) | |
tree | 8f8409c6d8d002f4cc1421b7fde7cd55290c169c /meta/classes | |
parent | e7c956337a050e1ac2bedcdd28e10ed20da7d1cc (diff) | |
download | poky-28530c28f9384a1baf48483db4664cf444ec7ea3.tar.gz |
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: c59ffcc4ba70cec8b6342a0205b880953919cba7)
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d0f863a24d05bddeb21e181fb01fa0051c79d7d8)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 6f35b612c2..e6bf27cf38 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -24,6 +24,7 @@ SDK_INCLUDE_NATIVESDK ?= "0" | |||
24 | SDK_INCLUDE_BUILDTOOLS ?= '1' | 24 | SDK_INCLUDE_BUILDTOOLS ?= '1' |
25 | 25 | ||
26 | SDK_RECRDEP_TASKS ?= "" | 26 | SDK_RECRDEP_TASKS ?= "" |
27 | SDK_CUSTOM_TEMPLATECONF ?= "0" | ||
27 | 28 | ||
28 | SDK_LOCAL_CONF_WHITELIST ?= "" | 29 | SDK_LOCAL_CONF_WHITELIST ?= "" |
29 | SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ | 30 | SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ |
@@ -199,6 +200,9 @@ python copy_buildsystem () { | |||
199 | buildsystem = oe.copy_buildsystem.BuildSystem('extensible SDK', d) | 200 | buildsystem = oe.copy_buildsystem.BuildSystem('extensible SDK', d) |
200 | baseoutpath = d.getVar('SDK_OUTPUT') + '/' + d.getVar('SDKPATH') | 201 | baseoutpath = d.getVar('SDK_OUTPUT') + '/' + d.getVar('SDKPATH') |
201 | 202 | ||
203 | #check if custome templateconf path is set | ||
204 | use_custom_templateconf = d.getVar('SDK_CUSTOM_TEMPLATECONF') | ||
205 | |||
202 | # Determine if we're building a derivative extensible SDK (from devtool build-sdk) | 206 | # Determine if we're building a derivative extensible SDK (from devtool build-sdk) |
203 | derivative = (d.getVar('SDK_DERIVATIVE') or '') == '1' | 207 | derivative = (d.getVar('SDK_DERIVATIVE') or '') == '1' |
204 | if derivative: | 208 | if derivative: |
@@ -390,7 +394,7 @@ python copy_buildsystem () { | |||
390 | shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat') | 394 | shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat') |
391 | 395 | ||
392 | # Use templateconf.cfg file from builddir if exists | 396 | # Use templateconf.cfg file from builddir if exists |
393 | if os.path.exists(builddir + '/conf/templateconf.cfg'): | 397 | if os.path.exists(builddir + '/conf/templateconf.cfg') and use_custom_templateconf == '1': |
394 | shutil.copyfile(builddir + '/conf/templateconf.cfg', baseoutpath + '/conf/templateconf.cfg') | 398 | shutil.copyfile(builddir + '/conf/templateconf.cfg', baseoutpath + '/conf/templateconf.cfg') |
395 | else: | 399 | else: |
396 | # Write a templateconf.cfg | 400 | # Write a templateconf.cfg |