[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2452/8267] classes/populate_sdk_ext: ensure we clean the right temporary TMPDIR path

[Emmanuele Bassi <ebassi src gnome org>]

commit ca107522eb5115798f097602d39eb586edaabc4a
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Wed Sep 14 17:09:51 2016 +1200

    classes/populate_sdk_ext: ensure we clean the right temporary TMPDIR path
    
    After we run the build system within the eSDK internally as part of the
    sstate filtering that happens during do_populate_sdk_ext, we need to
    ensure that the TMPDIR created during that process gets deleted. However
    we were using the TMPDIR path for the build producing the eSDK which may
    not be the same (since that value would typically be filtered out) thus
    if the user had set TMPDIR to something other than the default, the
    temporary TMPDIR would not be deleted which not only led to extraneous
    junk entering the SDK but also failures during install because the
    TMPDIR path was different. In order to fix this, force TMPDIR to a known
    value during the sstate filtering run so we know what to delete
    afterwards.
    
    Fixes [YOCTO #10210].
    
    (From OE-Core rev: 038d9db66e69c9de12eb8581acb28a8facd726b6)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 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 1a15d2a..5402988 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(
 def clean_esdk_builddir(d, sdkbasepath):
     """Clean up traces of the fake build for create_filtered_tasklist()"""
     import shutil
-    cleanpaths = 'cache conf/sanity_info conf/templateconf.cfg'.split()
-    cleanpaths.append(os.path.basename(d.getVar('TMPDIR', True)))
+    cleanpaths = 'cache conf/sanity_info conf/templateconf.cfg tmp'.split()
     for pth in cleanpaths:
         fullpth = os.path.join(sdkbasepath, pth)
         if os.path.isdir(fullpth):
@@ -109,10 +108,12 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath):
     # Create a temporary build directory that we can pass to the env setup script
     shutil.copyfile(sdkbasepath + '/conf/local.conf', sdkbasepath + '/conf/local.conf.bak')
     try:
-        # Force the use of sstate from the build system
         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', True))
             f.write('SSTATE_MIRRORS_forcevariable = ""\n')
+            # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it
+            f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n')
             # Drop uninative if the build isn't using it (or else NATIVELSBSTRING will
             # be different and we won't be able to find our native sstate)
             if not bb.data.inherits_class('uninative', d):