summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-14 17:09:51 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:12 +0100
commitca107522eb5115798f097602d39eb586edaabc4a (patch)
tree32e08d67d105b06137877989ca6cb79f16fcbb68 /meta
parent533315b747cd9331ea92506bdaa7b61e5635989b (diff)
downloadpoky-ca107522eb5115798f097602d39eb586edaabc4a.tar.gz
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>
Diffstat (limited to 'meta')
-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):