summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-08-08 23:01:17 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-08-11 16:40:33 +1200
commit2d8113d1c3f515bf0959bc15adfaf6f316efd20b (patch)
treeae5e7168fb11cc08ff241bc9038bc64196c10bc8
parent97516475467161429710576f1c340553d0618a9f (diff)
downloadopenembedded-core-contrib-2d8113d1c3f515bf0959bc15adfaf6f316efd20b.tar.gz
openembedded-core-contrib-2d8113d1c3f515bf0959bc15adfaf6f316efd20b.tar.bz2
openembedded-core-contrib-2d8113d1c3f515bf0959bc15adfaf6f316efd20b.zip
classes/populate_sdk_ext: sstate filtering fixes
A couple of fixes for the recent sstate filtering implemented in OE-Core revision 4b7b48fcb9b39fccf8222650c2608325df2a4507: * We shouldn't be deleting the downloads directory here, since it contains the uninative tarball that we will need * TMPDIR might not be named "tmp" - in OE-Core the default is tmp-glibc so use the actual name of TMPDIR here instead. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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 c16e228e7e..a075a0930a 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -85,10 +85,11 @@ SDK_EXT_HOST_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAINEXT_OUTPUTNAME}.host.manifest"
SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK"
-def clean_esdk_builddir(sdkbasepath):
+def clean_esdk_builddir(d, sdkbasepath):
"""Clean up traces of the fake build for create_filtered_tasklist()"""
import shutil
- cleanpaths = 'tmp cache conf/sanity_info conf/templateconf.cfg downloads'.split()
+ cleanpaths = 'cache conf/sanity_info conf/templateconf.cfg'.split()
+ cleanpaths.append(os.path.basename(d.getVar('TMPDIR', True)))
for pth in cleanpaths:
fullpth = os.path.join(sdkbasepath, pth)
if os.path.isdir(fullpth):
@@ -140,7 +141,7 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath):
os.rename(temp_sdkbasepath, sdkbasepath)
# Clean out residue of running bitbake, which check_sstate_task_list()
# will effectively do
- clean_esdk_builddir(sdkbasepath)
+ clean_esdk_builddir(d, sdkbasepath)
finally:
os.replace(sdkbasepath + '/conf/local.conf.bak', sdkbasepath + '/conf/local.conf')