#
# old_revision [4c108250ef95743112aee6c23a4f206124025bbb]
#
# patch "classes/package_deb.bbclass"
#  from [e921fa8625c039aae270b843336c64fbd0a5dbf2]
#    to [5b8e9230ef7a807084e2a9411f0ffe1055eb1e11]
#
============================================================
--- classes/package_deb.bbclass	e921fa8625c039aae270b843336c64fbd0a5dbf2
+++ classes/package_deb.bbclass	5b8e9230ef7a807084e2a9411f0ffe1055eb1e11
@@ -1,14 +1,11 @@ inherit package
 #
 # Copyright 2006-2007 OpenedHand Ltd.
 #
 
 inherit package
 
-PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native"
-
 BOOTSTRAP_EXTRA_RDEPENDS += "dpkg"
 DISTRO_EXTRA_RDEPENDS += "dpkg"
-PACKAGE_WRITE_FUNCS += "do_package_deb"
 IMAGE_PKGTYPE ?= "deb"
 
 python package_deb_fn () {
@@ -64,9 +61,7 @@ python do_package_deb () {
 }
 
 python do_package_deb () {
-    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:
@@ -99,9 +94,19 @@ python do_package_deb () {
         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)
@@ -247,4 +252,18 @@ python do_package_deb () {
         except OSError:
             pass
         del localdata
+        unlockfile(lf)
 }
+python () {
+    import bb
+    if bb.data.getVar('PACKAGES', d, True) != '':
+        bb.data.setVarFlag('do_package_write_deb', 'depends', 'dpkg-native:do_populate_staging fakeroot-native:do_populate_staging', d)
+}
+
+python do_package_write_deb () {
+	bb.build.exec_func("read_subpackage_metadata", d)
+	bb.build.exec_func("do_package_deb", d)
+}
+do_package_write_deb[dirs] = "${D}"
+addtask package_write_deb before do_package_write after do_package
+