diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2010-03-16 18:43:14 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-03-16 18:43:14 -0700 |
| commit | 394d321684eec271bc55438e3c01f74825d80988 (patch) | |
| tree | c5206a84d7d31b9f156f65b19f971d0de24a6744 /classes | |
| parent | 2465c93bcb894b109badf81fdde2445c8d6ff363 (diff) | |
| download | openembedded-394d321684eec271bc55438e3c01f74825d80988.tar.gz | |
packaged-staging: Grab the staging lock before we copy and test the stamps so
that we don't have other threads try and validate or install based on them
being valid. This is a potential issue for certain BB_STAMP_POLICY (such as
the default) values and enough concurrent threads.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/packaged-staging.bbclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 1ede25cef0..da9d0f34c6 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -189,11 +189,20 @@ python packagestage_scenefunc () { bb.fatal("Couldn't install the staging package to a temp directory") # + # Grab the staging lock now so that we don't have other threads try and + # validate or install based on these stamps being valid. This is a + # potential issue for certain BB_STAMP_POLICY values and enough + # concurrent threads. + # + lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d)) + + # # Copy the stamp files into the main stamps directoy # cmd = bb.data.expand("cp -dpR ${WORKDIR}/tstage/stamps/* ${TMPDIR}/stamps/", d) ret = os.system(cmd) if ret != 0: + bb.utils.unlockfile(lf) bb.fatal("Couldn't copy the staging package stamp files") # @@ -213,6 +222,7 @@ python packagestage_scenefunc () { stageok = bb.runqueue.check_stamp_fn(file, task, d) bb.debug(1, "Result %s" % (stageok)) if not stageok: + bb.utils.unlockfile(lf) break # Remove the stamps and files we added above @@ -223,7 +233,6 @@ python packagestage_scenefunc () { if stageok: bb.note("Staging package found, using it for %s." % file) installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1) - lf = bb.utils.lockfile(bb.data.expand("${SYSROOT_LOCK}", d)) ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg)) bb.utils.unlockfile(lf) if ret != 0: |