diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-01-20 07:29:16 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-20 11:53:49 +0000 |
commit | 785bec81ef75878749bd3a7a355bbd6aab16a198 (patch) | |
tree | be3ab289926c0bb3c85049a37967e273184f3a57 /meta/classes | |
parent | 620f5880d806a141c70861e3605c272726e129cb (diff) | |
download | poky-785bec81ef75878749bd3a7a355bbd6aab16a198.tar.gz |
classes/populate_sdk_ext: force a known value for TMPDIR
If TMPDIR is configured to be somewhere outside of TOPDIR (a not
uncommon configuration where you have multiple disks and space on /home
is at a premium) then our attempt to find out the location of paths
under TMPDIR by using a relative path led to horribly broken paths
ending up in the eSDK. To save pain, just force a known value for TMPDIR
(i.e. ${TOPDIR}/tmp) and then we can assume that everywhere else.
Fixes [YOCTO #10797].
(From OE-Core rev: 4fe60d526a94f30b201c434994e80fef0f7392f0)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index f21ae8be41..d5f6de9028 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -282,6 +282,7 @@ python copy_buildsystem () { | |||
282 | # Write a newline just in case there's none at the end of the original | 282 | # Write a newline just in case there's none at the end of the original |
283 | f.write('\n') | 283 | f.write('\n') |
284 | 284 | ||
285 | f.write('TMPDIR = "${TOPDIR}/tmp"\n') | ||
285 | f.write('DL_DIR = "${TOPDIR}/downloads"\n') | 286 | f.write('DL_DIR = "${TOPDIR}/downloads"\n') |
286 | 287 | ||
287 | f.write('INHERIT += "%s"\n' % 'uninative') | 288 | f.write('INHERIT += "%s"\n' % 'uninative') |
@@ -512,8 +513,8 @@ install_tools() { | |||
512 | # (they get populated from sstate on installation) | 513 | # (they get populated from sstate on installation) |
513 | unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd" | 514 | unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd" |
514 | if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" -a ! -e $unfsd_path ] ; then | 515 | if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" -a ! -e $unfsd_path ] ; then |
515 | binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE'), d.getVar('TOPDIR'))} | 516 | binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE'), d.getVar('TMPDIR'))} |
516 | lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd $unfsd_path | 517 | lnr ${SDK_OUTPUT}/${SDKPATH}/tmp/$binrelpath/unfsd $unfsd_path |
517 | fi | 518 | fi |
518 | touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase | 519 | touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase |
519 | 520 | ||