summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2012-04-11 14:15:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-11 12:08:14 +0100
commit5fb36b041c612b80cf35d6ecd35bddd1e108a210 (patch)
tree38fbee222f1cd0ea4ca06688aaa0a3d9036b83dc
parentacdcb3c7e0c6de26612f3364123bbeb779be243e (diff)
downloadpoky-5fb36b041c612b80cf35d6ecd35bddd1e108a210.tar.gz
poky-5fb36b041c612b80cf35d6ecd35bddd1e108a210.tar.bz2
poky-5fb36b041c612b80cf35d6ecd35bddd1e108a210.zip
archiver.bbclass: Amend the problem for moving tarballs in ${DL_DIR} to ${DEPLOY_DIR}/source when enable archiver
When running "bitbake core-imamge-minmal", the error information like the following will appear: ERROR: Error executing a python function in /buildarea2/yzhao-test/poky-test/meta/recipes-core/zlib/zlib_1.2.6.bb: IOError: [Errno 2] No such file or directory: '/buildarea2/yzhao-test/poky-test/build-archive/downloads/zlib-1.2.6.tar.bz2' An absolute path from variable "file" pointed to tarballs in ${DL_DIR} \ cause this problem. So return base-name of "file" for fixing this bug here. [YOCTO #2272] (From OE-Core rev: 40c34087dea6869e5ec9a655980de3c3baa01960) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/archiver.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 4e4e964a24..59b58f4403 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -173,6 +173,7 @@ def archive_sources(d,stage_name):
file = get_source_from_downloads(d,stage_name)
if file:
shutil.copy(file,work_dir)
+ file = os.path.basename(file)
else:
file = archive_sources_from_directory(d,stage_name)
return file