[oe-commits] Xiaofeng Yan : archiver.bbclass: Amend the problem for moving tarballs in ${DL_DIR} to ${DEPLOY_DIR}/ source when enable archiver

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 40c34087dea6869e5ec9a655980de3c3baa01960
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=40c34087dea6869e5ec9a655980de3c3baa01960

Author: Xiaofeng Yan <xiaofeng.yan at windriver.com>
Date:   Wed Apr 11 14:15:17 2012 +0800

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]

Signed-off-by: Xiaofeng Yan <xiaofeng.yan at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/archiver.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 4e4e964..59b58f4 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