diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-08-11 16:45:01 +1200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-17 10:32:04 +0100 |
| commit | 71ecd3bea680ef8c589257844512a14b65e979d3 (patch) | |
| tree | 6297b3a3d64b91f30ba4b5da8f8462c364ff6b22 | |
| parent | 9f39deea7c4af5244dbfa824a52e11590a1d4df6 (diff) | |
| download | openembedded-core-71ecd3bea680ef8c589257844512a14b65e979d3.tar.gz openembedded-core-71ecd3bea680ef8c589257844512a14b65e979d3.tar.bz2 openembedded-core-71ecd3bea680ef8c589257844512a14b65e979d3.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>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 7 |
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') |