diff options
author | Yu Ke <ke.yu@intel.com> | 2011-01-04 15:55:33 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-04 09:46:37 -0800 |
commit | 30d27115ec38b8191d81504858d105b0d91277d8 (patch) | |
tree | bb27f8b59ba45a137f3012f2c1ac2db759705196 | |
parent | ca148f4627ed7e1b4858a9d0950b5e720df17e09 (diff) | |
download | openembedded-core-30d27115ec38b8191d81504858d105b0d91277d8.tar.gz openembedded-core-30d27115ec38b8191d81504858d105b0d91277d8.tar.bz2 openembedded-core-30d27115ec38b8191d81504858d105b0d91277d8.zip |
base.bbclass: add lock file for do_unpack task
This patch intend to fix the random unpack failure of linux-libc-headers-yocto
and linux-yocto.
The root cause of the unpack failure is that: these two recpies has the same URL, thus
has the same dest file during the fetch and unpack phase:
do_fetch : create tar ball ${DL_DIR}/git_git.pokylinux.org.linux-yocto-2.6.37.tar.gz
do_unpack : extract tar ball ${DL_DIR}/git_git.pokylinux.org.linux-yocto-2.6.37.tar.gz
fetch phase is protected by lockfile, so it works fine. but unpack phase is not lock protected,
thus there is race condition like: when linux-yocto do_unpack is extracting the tar ball,
linux-libc-headers-yocto do_fetch starts to create tar ball thus overwrite linux-yocto's
tar ball and cause linux-yocto do_unpack failure
To fix this issue, do_unpack also need to be protected by lock
Signed-off-by: Yu Ke <ke.yu@intel.com>
-rw-r--r-- | meta/classes/base.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 54a1dcd013..f8ce1232cd 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -242,6 +242,8 @@ python base_do_unpack() { localdata = bb.data.createCopy(d) bb.data.update_data(localdata) + urldata = bb.fetch.init([], localdata, True) + src_uri = bb.data.getVar('SRC_URI', localdata, True) if not src_uri: return @@ -253,7 +255,9 @@ python base_do_unpack() { if local is None: continue local = os.path.realpath(local) + lf = bb.utils.lockfile(urldata[url].lockfile) ret = oe_unpack_file(local, localdata, url) + bb.utils.unlockfile(lf) if not ret: raise bb.build.FuncFailed("oe_unpack_file failed with return value %s" % ret) } |