summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/populate_sdk_ext.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 1a15d2a70b..5402988ba9 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -88,8 +88,7 @@ SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar(
88def clean_esdk_builddir(d, sdkbasepath): 88def clean_esdk_builddir(d, sdkbasepath):
89 """Clean up traces of the fake build for create_filtered_tasklist()""" 89 """Clean up traces of the fake build for create_filtered_tasklist()"""
90 import shutil 90 import shutil
91 cleanpaths = 'cache conf/sanity_info conf/templateconf.cfg'.split() 91 cleanpaths = 'cache conf/sanity_info conf/templateconf.cfg tmp'.split()
92 cleanpaths.append(os.path.basename(d.getVar('TMPDIR', True)))
93 for pth in cleanpaths: 92 for pth in cleanpaths:
94 fullpth = os.path.join(sdkbasepath, pth) 93 fullpth = os.path.join(sdkbasepath, pth)
95 if os.path.isdir(fullpth): 94 if os.path.isdir(fullpth):
@@ -109,10 +108,12 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath):
109 # Create a temporary build directory that we can pass to the env setup script 108 # Create a temporary build directory that we can pass to the env setup script
110 shutil.copyfile(sdkbasepath + '/conf/local.conf', sdkbasepath + '/conf/local.conf.bak') 109 shutil.copyfile(sdkbasepath + '/conf/local.conf', sdkbasepath + '/conf/local.conf.bak')
111 try: 110 try:
112 # Force the use of sstate from the build system
113 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
114 f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR', True)) 113 f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR', True))
115 f.write('SSTATE_MIRRORS_forcevariable = ""\n') 114 f.write('SSTATE_MIRRORS_forcevariable = ""\n')
115 # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it
116 f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n')
116 # Drop uninative if the build isn't using it (or else NATIVELSBSTRING will 117 # Drop uninative if the build isn't using it (or else NATIVELSBSTRING will
117 # be different and we won't be able to find our native sstate) 118 # be different and we won't be able to find our native sstate)
118 if not bb.data.inherits_class('uninative', d): 119 if not bb.data.inherits_class('uninative', d):