summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_ext.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 14:22:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-16 14:08:28 +0100
commite4e8435886653789c93c95b99080d6c07ef78cbb (patch)
tree0af567ec25837f4b165774f0ebcc37659937ece9 /meta/classes/populate_sdk_ext.bbclass
parentdec53367a82ef6837657698fb303ff61ff68cd76 (diff)
downloadpoky-e4e8435886653789c93c95b99080d6c07ef78cbb.tar.gz
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. (From OE-Core rev: 6b9e8b780dcd8d5ffba3df35cfe41674413ee26d) 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.bbclass2
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):
111 with open(sdkbasepath + '/conf/local.conf', 'a') as f: 111 with open(sdkbasepath + '/conf/local.conf', 'a') as f:
112 # Force the use of sstate from the build system 112 # Force the use of sstate from the build system
113 f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR')) 113 f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR'))
114 f.write('SSTATE_MIRRORS_forcevariable = ""\n') 114 f.write('SSTATE_MIRRORS_forcevariable = "file://universal/(.*) file://universal-4.9/\\1 file://universal-4.9/(.*) file://universal-4.8/\\1"\n')
115 # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it 115 # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it
116 f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n') 116 f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n')
117 f.write('TCLIBCAPPEND_forcevariable = ""\n') 117 f.write('TCLIBCAPPEND_forcevariable = ""\n')