package_ipk/deb.bbclass: Add locking for package creation to stop conflicts

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2557 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 14 insertions, 3 deletions

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index afe70005d9..d88d11b994 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -61,9 +61,7 @@ python package_ipk_install () {
 }
 
 python do_package_ipk () {
-        import copy # to back up env data
-        import sys
-        import re
+        import sys, re, fcntl, copy
 
         workdir = bb.data.getVar('WORKDIR', d, 1)
         if not workdir:
@@ -97,10 +95,21 @@ python do_package_ipk () {
                 bb.debug(1, "No packages; nothing to do")
                 return
 
+        def lockfile(name):
+                lf = open(name, "a+")
+                fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
+                return lf
+
+        def unlockfile(lf):
+                fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
+                lf.close
+
         for pkg in packages.split():
                 localdata = bb.data.createCopy(d)
                 root = "%s/install/%s" % (workdir, pkg)
 
+                lf = lockfile(root + ".lock")
+
                 bb.data.setVar('ROOT', '', localdata)
                 bb.data.setVar('ROOT_%s' % pkg, root, localdata)
                 pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
@@ -129,6 +138,7 @@ python do_package_ipk () {
                 if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
                         from bb import note
                         note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+                        unlockfile(lf)
                         continue
                 controldir = os.path.join(root, 'CONTROL')
                 bb.mkdirhier(controldir)
@@ -236,6 +246,7 @@ python do_package_ipk () {
                 except OSError:
                         pass
                 del localdata
+                unlockfile(lf)
 }
 
 python () {