diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-08 14:22:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 09:11:16 +0100 |
commit | 6b9e8b780dcd8d5ffba3df35cfe41674413ee26d (patch) | |
tree | 062f258d4a18dfae7e60b14239dca78a0d4e93dd | |
parent | 851937dde81de2a9ef54c5f19a78fb12fb82afd4 (diff) | |
download | openembedded-core-6b9e8b780dcd8d5ffba3df35cfe41674413ee26d.tar.gz openembedded-core-6b9e8b780dcd8d5ffba3df35cfe41674413ee26d.tar.bz2 openembedded-core-6b9e8b780dcd8d5ffba3df35cfe41674413ee26d.zip |
populate_sdk_ext: Avoid build failures where sstate was used
If sstate was used to populate the build and one of the universal-4.8
or universal-4.9 mirror urls was used, the sstate checks during eSDK
construction could fail as it would zero out the SSTATE_MIRRORs
variable.
Use the same mirrors variable setting as the eSDK would end up using
to perform the checks to avoid this.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 4dfb94caf1..69bc1d91dd 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -111,7 +111,7 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath): with open(sdkbasepath + '/conf/local.conf', 'a') as f: # Force the use of sstate from the build system f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR')) - f.write('SSTATE_MIRRORS_forcevariable = ""\n') + f.write('SSTATE_MIRRORS_forcevariable = "file://universal/(.*) file://universal-4.9/\\1 file://universal-4.9/(.*) file://universal-4.8/\\1"\n') # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n') f.write('TCLIBCAPPEND_forcevariable = ""\n') |