diff options
author | Ross Burton <ross.burton@intel.com> | 2016-10-14 13:57:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-15 10:01:43 +0100 |
commit | b2726f75159900f513bc70d3de7a1923ce8f9f2b (patch) | |
tree | c579f9acfd973feab397f68cbf85b303ed0eeeb8 | |
parent | 7052400ceadd309a11c3c8dd2b2a4879d69aac02 (diff) | |
download | poky-b2726f75159900f513bc70d3de7a1923ce8f9f2b.tar.gz |
populate_sdk_ext: explicitly set DL_DIR
The eSDK generation assumes that DL_DIR is downloads/ under the build directory,
and puts files such as a freshly buily uninative tarball in there expecting
bitbake will find it later.
Whilst ${TOPDIR}/downloads/ is in fact the default value for DL_DIR in
bitbake.conf, and any instances of DL_DIR are removed from the original
local.conf, there is still the possibility that other layers could contain a
site.conf that assigns DL_DIR.
If this happens the errors are quite mysterious as it fails to find the
uninative tarball and so the hashes all change, and eSDK building fails.
Ensure that this cannot happen by explicitly assigning the DL_DIR that we
require, instead of assuming that the default value will be used.
[ YOCTO #10439 ]
(From OE-Core rev: bc2e6f5eab47e869dbc4a3eacfe759b9b1cacaee)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index ddf3962fa4..0f0525d764 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -282,6 +282,8 @@ 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('DL_DIR = "${TOPDIR}/downloads"\n') | ||
286 | |||
285 | f.write('INHERIT += "%s"\n' % 'uninative') | 287 | f.write('INHERIT += "%s"\n' % 'uninative') |
286 | f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH', True), uninative_checksum)) | 288 | f.write('UNINATIVE_CHECKSUM[%s] = "%s"\n\n' % (d.getVar('BUILD_ARCH', True), uninative_checksum)) |
287 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) | 289 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) |